sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: linux build tweaks to allow static oiio/boost build.

Browse Source 
Wiki build instructions have been updated to do static linking now:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/Building
This commit is contained in:
Brecht Van Lommel 2011-08-24 19:21:04 +00:00
parent 564eae2dc4
commit dc557b7440
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@ -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()

7
build_files/cmake/macros.cmake
View File

@ -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")