diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 08:54:07 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-12 08:54:07 +0300 |
| commit | 2597cd39982100efeeb13b597f3e432ef9346d85 (patch) | |
| tree | 96b7cd824f5038d5a63ec025957e4503e544f95f /CMakeLists.txt | |
| parent | 7eecc9407415e18eaab2ded2fcc883edbf58c633 (diff) | |
| parent | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f86a696d419..fa1405994c3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,7 +166,6 @@ option_defaults_init( _init_SDL _init_FFTW3 _init_OPENSUBDIV - _init_SYSTEM_OPENJPG ) # customize... @@ -183,13 +182,11 @@ if(UNIX AND NOT APPLE) set(_init_SDL OFF) set(_init_FFTW3 OFF) set(_init_OPENSUBDIV OFF) - set(_init_SYSTEM_OPENJPG OFF) elseif(WIN32) set(_init_JACK OFF) elseif(APPLE) set(_init_JACK OFF) set(_init_OPENSUBDIV OFF) - set(_init_SYSTEM_OPENJPG OFF) endif() @@ -299,9 +296,6 @@ else() endif() -# (unix defaults to System OpenJPEG On) -option(WITH_SYSTEM_OPENJPEG "Use the operating systems OpenJPEG library" ${_init_SYSTEM_OPENJPG}) - if(UNIX AND NOT APPLE) option(WITH_SYSTEM_EIGEN3 "Use the systems Eigen3 library" OFF) endif() @@ -970,16 +964,11 @@ else() unset(_SYSTEM_BIG_ENDIAN) endif() if(WITH_IMAGE_OPENJPEG) - if(WITH_SYSTEM_OPENJPEG) - # dealt with above - set(OPENJPEG_DEFINES "") - else() - set(OPENJPEG_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/extern/libopenjpeg") - set(OPENJPEG_DEFINES "-DOPJ_STATIC") - endif() # Special handling of Windows platform where openjpeg is always static. if(WIN32) set(OPENJPEG_DEFINES "-DOPJ_STATIC") + else() + set(OPENJPEG_DEFINES "") endif() endif() @@ -1678,7 +1667,6 @@ if(FIRST_RUN) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_option(WITH_MEM_VALGRIND) info_cfg_option(WITH_SYSTEM_GLEW) - info_cfg_option(WITH_SYSTEM_OPENJPEG) info_cfg_text("Image Formats:") info_cfg_option(WITH_OPENIMAGEIO) |