diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2013-03-27 22:44:46 +0400 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2013-03-27 22:44:46 +0400 |
| commit | 48c56a06160c1ce5c885df082980a0e328b55f30 (patch) | |
| tree | b27fd1222ddab12d67ac32b7069fed64d8557171 /CMakeLists.txt | |
| parent | 9c73c910395e8dd057a134dc3a68b7f78656d00b (diff) | |
CMake fix: OpenEXR and Tiff are linking dependencies of OIIO, and fix for Boost-Cycles-OIIO order
The NOT BOOST test was changing Cycles so should be before the
cycles-oiio link (by Campbell Barton, thanks)
And exr and tiff are required for oiio (on OSX at least)
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fe051db871f..14f45c0b7f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -408,11 +408,6 @@ if(WITH_PYTHON_MODULE) set(WITH_HEADLESS ON) endif() -# auto enable openimageio for cycles -if(WITH_CYCLES) - set(WITH_OPENIMAGEIO ON) -endif() - # enable boost for cycles, booleans, audaspace or i18n # otherwise if the user disabled if(NOT WITH_BOOST) @@ -431,6 +426,17 @@ else() set(WITH_BOOST OFF) endif() +# auto enable openimageio for cycles +if(WITH_CYCLES) + set(WITH_OPENIMAGEIO ON) +endif() + +# auto enable openimageio linking dependencies +if(WITH_OPENIMAGEIO) + set(WITH_IMAGE_OPENEXR ON) + set(WITH_IMAGE_TIFF ON) +endif() + # auto enable llvm for cycles_osl if(WITH_CYCLES_OSL) set(WITH_LLVM ON CACHE BOOL "ON" FORCE) |