diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 23:21:04 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-24 23:21:04 +0400 |
| commit | dc557b74409cf31a6406b26bbbe9302590319e86 (patch) | |
| tree | fe2496037313338595fe6eb5bd329972e56afc5e /CMakeLists.txt | |
| parent | 564eae2dc40a99b53ef01390e58813998dd61953 (diff) | |
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
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 6 insertions, 4 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() |