From dc557b74409cf31a6406b26bbbe9302590319e86 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Wed, 24 Aug 2011 19:21:04 +0000
Subject: [PATCH] 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
---
 CMakeLists.txt                 | 10 ++++++----
 build_files/cmake/macros.cmake |  7 ++++---
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f2f6ba2b743..eb4323416ca 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -519,9 +519,11 @@ if(UNIX AND NOT APPLE)
 			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 @@ if(UNIX AND NOT APPLE)
 		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()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 437ad92631f..234d40668ba 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -278,12 +278,13 @@ macro(setup_liblinks
 	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")