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 /intern | |
| parent | 7eecc9407415e18eaab2ded2fcc883edbf58c633 (diff) | |
| parent | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern')
| -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) |