Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.

Browse Source
This commit is contained in:
Campbell Barton
2011-11-08 18:15:53 +00:00
parent 8cfc17c7cd
commit 4292fa702f
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@@ -502,13 +502,19 @@ if(UNIX AND NOT APPLE)
endif() endif()
if(WITH_BOOST) if(WITH_BOOST)
set(BOOST "/usr" CACHE PATH "Boost Directory")
# not sure this is needed, commenting, campbell
# ---
# set(BOOST "/usr" CACHE PATH "Boost Directory")
#
# if(NOT BOOST_CUSTOM)
# set(BOOST_ROOT ${BOOST})
# set(Boost_USE_MULTITHREADED ON)
# find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
# endif()
if(NOT BOOST_CUSTOM) set(Boost_USE_MULTITHREADED ON)
set(BOOST_ROOT ${BOOST}) find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
set(Boost_USE_MULTITHREADED ON)
find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
endif()
set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
set(BOOST_LIBRARIES ${Boost_LIBRARIES}) set(BOOST_LIBRARIES ${Boost_LIBRARIES})
@@ -517,8 +523,6 @@ if(UNIX AND NOT APPLE)
endif() endif()
if(WITH_OPENIMAGEIO) if(WITH_OPENIMAGEIO)
set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
find_package(OpenImageIO) find_package(OpenImageIO)
set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})