diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-07-01 19:26:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-07-01 19:26:25 +0400 |
| commit | 7d223a1d14bf18e296c012df7dd36869957ccd80 (patch) | |
| tree | 9d2fcd7ac8022f572c5e2471d64fc0d796b6c9c7 | |
| parent | f81c38ce2dd5e244c7a9aa47736c6aba44b84fb0 (diff) | |
don't disable cycles when OIIO isnt found, instead throw an error, annoying when full build is done and later find cycles isn't on.
| -rw-r--r-- | CMakeLists.txt | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e5ee162779c..9e1ef4f5d4b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -667,7 +667,6 @@ 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() @@ -1458,6 +1457,16 @@ if(APPLE OR WIN32) endif() endif() +if(WITH_CYCLES) + if(NOT WITH_OPENIMAGEIO) + message(FATAL_ERROR "Cycles reqires WITH_OPENIMAGEIO, the library may not have been found. Configure OIIO or disable WITH_CYCLES") + endif() + if(NOT WITH_BOOST) + message(FATAL_ERROR "Cycles reqires WITH_BOOST, the library may not have been found. Configure BOOST or disable WITH_CYCLES") + endif() +endif() + + # See TEST_SSE_SUPPORT() for how this is defined. if(WITH_RAYOPTIMIZATION) |