diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 22:15:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-08 22:15:53 +0400 |
| commit | 4292fa702f107e93d063ce3eff7abbf1bc7933c6 (patch) | |
| tree | 0c0808ad022cc6963ab958cac8d8e2a8e9dee7f7 | |
| parent | 8cfc17c7cdef0ea6fc3bfc196e317e2cb3add4b0 (diff) | |
stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3f6d867d707..21f5ffb2f47 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -502,13 +502,19 @@ if(UNIX AND NOT APPLE) endif() if(WITH_BOOST) - 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() + + # 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() + + set(Boost_USE_MULTITHREADED ON) + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) set(BOOST_LIBRARIES ${Boost_LIBRARIES}) @@ -517,8 +523,6 @@ if(UNIX AND NOT APPLE) endif() if(WITH_OPENIMAGEIO) - set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory") - find_package(OpenImageIO) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) |