[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39681] branches/cycles: Cycles: linux build tweaks to allow static oiio/boost build.

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


Revision: 39681
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39681
Author:   blendix
Date:     2011-08-24 19:21:04 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
Cycles: linux build tweaks to allow static oiio/boost build.

Wiki build instructions have been updated to do static linking now:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/Building

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

Modified: branches/cycles/CMakeLists.txt
===================================================================
--- branches/cycles/CMakeLists.txt	2011-08-24 18:23:21 UTC (rev 39680)
+++ branches/cycles/CMakeLists.txt	2011-08-24 19:21:04 UTC (rev 39681)
@@ -519,9 +519,11 @@
 			set(BOOST "/usr" CACHE PATH "Boost Directory")
 		endif()
 
-		set(BOOST_ROOT ${BOOST})
-		set(Boost_USE_MULTITHREADED ON)
-		find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
+		if(NOT BOOST_CUSTOM)
+			set(BOOST_ROOT ${BOOST})
+			set(Boost_USE_MULTITHREADED ON)
+			find_package(Boost 1.47 REQUIRED COMPONENTS filesystem regex system thread)
+		endif()
 
 		set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
 		set(BOOST_LIBRARIES ${Boost_LIBRARIES})
@@ -538,7 +540,7 @@
 		endif()
 
 		set(OPENIMAGEIO_INCLUDE_DIR ${OPENIMAGEIO}/include)
-		set(OPENIMAGEIO_LIBRARY OpenImageIO)
+		set(OPENIMAGEIO_LIBRARY OpenImageIO ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 		set(OPENIMAGEIO_DEFINITIONS)
 	endif()

Modified: branches/cycles/build_files/cmake/macros.cmake
===================================================================
--- branches/cycles/build_files/cmake/macros.cmake	2011-08-24 18:23:21 UTC (rev 39680)
+++ branches/cycles/build_files/cmake/macros.cmake	2011-08-24 19:21:04 UTC (rev 39681)
@@ -278,12 +278,13 @@
 	if(WITH_IMAGE_TIFF)
 		target_link_libraries(${target} ${TIFF_LIBRARY})
 	endif()
-	if(WITH_BOOST)
-		target_link_libraries(${target} ${BOOST_LIBRARIES})
-	endif()
 	if(WITH_OPENIMAGEIO)
 		target_link_libraries(${target} ${OPENIMAGEIO_LIBRARY})
 	endif()
+	if(WITH_BOOST)
+		set(${boost_libs} ${BOOST_LIBRARIES})
+		target_link_libraries(${target} ${boost_libs})
+	endif()
 	if(WITH_IMAGE_OPENEXR)
 		if(WIN32 AND NOT UNIX)
 			file_list_suffix(OPENEXR_LIBRARIES_DEBUG "${OPENEXR_LIBRARIES}" "_d")




More information about the Bf-blender-cvs mailing list