diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14c9c8c8679..17ea5cf249d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -507,7 +507,7 @@ if(UNIX AND NOT APPLE) if(NOT BOOST_CUSTOM) set(BOOST_ROOT ${BOOST}) set(Boost_USE_MULTITHREADED ON) - find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread) + find_package(Boost 1.34 COMPONENTS filesystem regex system thread) endif() set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS}) @@ -520,7 +520,7 @@ if(UNIX AND NOT APPLE) set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory") set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO}) - find_package(OpenImageIO REQUIRED) + find_package(OpenImageIO) set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES}) set(OPENIMAGEIO_LIBPATH) # TODO, remove and reference the absolute path everywhere @@ -528,6 +528,8 @@ if(UNIX AND NOT APPLE) if(NOT OPENIMAGEIO_FOUND) set(WITH_OPENIMAGEIO OFF) + set(WITH_CYCLES OFF) + message(STATUS "OpenImageIO not found, disabling WITH_CYCLES") endif() endif() @@ -949,9 +951,6 @@ elseif(WIN32) set(PYTHON_LIBRARIES "${PYTHON_LIBRARY}") endif() - # disable for now, not building yet - set(WITH_CYCLES OFF) - if(WITH_BOOST) set(BOOST ${LIBDIR}/gcc/boost) set(BOOST_INCLUDE_DIR ${BOOST}/include) |