diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-08-30 15:20:19 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-09-11 13:45:05 +0300 |
| commit | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (patch) | |
| tree | 9a8fa5b751f9b27380de9b3dde35f93086deda0b /intern/cycles/test/CMakeLists.txt | |
| parent | bf8aac0d491ae7ea9c52c5911f61f041cfffdafc (diff) | |
Build: require OpenJPEG 2.x minimum, remove bundled version.
* WITH_SYSTEM_OPENJPEG is removed and is now always on, this was already
the case for macOS and Windows.
* This should not break existing Linx builds. If there is no new enough
OpenJPEG installed, CMake will no find libopenjp2 and WITH_IMAGE_OPENJPEG
will be disabled.
* install_deps.sh was updated with new package names, since distributions
put this version in a new package.
Differential Revision: https://developer.blender.org/D3663
Diffstat (limited to 'intern/cycles/test/CMakeLists.txt')
| -rw-r--r-- | intern/cycles/test/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/intern/cycles/test/CMakeLists.txt b/intern/cycles/test/CMakeLists.txt index 332e0d8cc78..a2e527c7144 100644 --- a/intern/cycles/test/CMakeLists.txt +++ b/intern/cycles/test/CMakeLists.txt @@ -48,11 +48,7 @@ if(WITH_OPENCOLORIO) ) endif() if(WITH_IMAGE_OPENJPEG) - if(WITH_SYSTEM_OPENJPEG) - list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES}) - else() - list(APPEND ALL_CYCLES_LIBRARIES extern_openjpeg) - endif() + list(APPEND ALL_CYCLES_LIBRARIES ${OPENJPEG_LIBRARIES}) endif() if(WITH_CYCLES_OPENSUBDIV) add_definitions(-DWITH_OPENSUBDIV) |