[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39682] branches/cycles/build_files/cmake/ macros.cmake: Cycles: small fix for last commit, don't know what' s going on here

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Aug 24 21:31:14 CEST 2011


Revision: 39682
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39682
Author:   blendix
Date:     2011-08-24 19:31:14 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Cycles: small fix for last commit, don't know what's going on here
exactly but this solves it for now.

Modified Paths:
--------------
    branches/cycles/build_files/cmake/macros.cmake

Modified: branches/cycles/build_files/cmake/macros.cmake
===================================================================
--- branches/cycles/build_files/cmake/macros.cmake	2011-08-24 19:21:04 UTC (rev 39681)
+++ branches/cycles/build_files/cmake/macros.cmake	2011-08-24 19:31:14 UTC (rev 39682)
@@ -282,8 +282,12 @@
 		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARY})
 	endif()
 	if(WITH_BOOST)
-		set(${boost_libs} ${BOOST_LIBRARIES})
-		target_link_libraries(${target} ${boost_libs})
+		if(BOOST_CUSTOM)
+			set(${boost_libs} ${BOOST_LIBRARIES})
+			target_link_libraries(${target} ${boost_libs})
+		else()
+			target_link_libraries(${target} ${BOOST_LIBRARIES})
+		endif()
 	endif()
 	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)




More information about the Bf-blender-cvs mailing list