diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-28 02:24:38 +0400 |
commit | f13829c7826e61c14d78f20bd347228f01367706 (patch) | |
tree | b4ccd417411dbbcef50187169a285ce5953578af /CMakeLists.txt | |
parent | 765a10a8cdaa09ba7ffb06139c05255948d41518 (diff) | |
parent | d15d78a33a8df76b02fa0d27dacd85c8a77ec109 (diff) |
svn merge ^/trunk/blender -r55594:55635
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 20 |
1 files changed, 15 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 58f0fb08318..382e0108978 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -229,6 +229,9 @@ option(WITH_OPENCOLLADA "Enable OpenCollada Support (http://www.opencollada.org option(WITH_SDL "Enable SDL for sound and joystick support" ON) option(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON) option(WITH_JACK "Enable Jack Support (http://www.jackaudio.org)" OFF) +if(UNIX AND NOT APPLE) + option(WITH_JACK_DYNLOAD "Enable runtime dynamic Jack libraries loading" OFF) +endif() # Compression option(WITH_LZO "Enable fast LZO compression (used for pointcache)" ON) @@ -408,11 +411,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 +429,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) @@ -2205,6 +2214,7 @@ if(FIRST_RUN) info_cfg_option(WITH_OPENAL) info_cfg_option(WITH_SDL) info_cfg_option(WITH_JACK) + info_cfg_option(WITH_JACK_DYNLOAD) info_cfg_option(WITH_CODEC_AVI) info_cfg_option(WITH_CODEC_FFMPEG) info_cfg_option(WITH_CODEC_SNDFILE) |