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 /build_files/cmake | |
| parent | 7eecc9407415e18eaab2ded2fcc883edbf58c633 (diff) | |
| parent | a1651ddc98ec760e522ea2ea8169b726661fa2e6 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'build_files/cmake')
| -rw-r--r-- | build_files/cmake/Modules/FindOpenJPEG.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/macros.cmake | 2 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 1 |
3 files changed, 1 insertions, 4 deletions
diff --git a/build_files/cmake/Modules/FindOpenJPEG.cmake b/build_files/cmake/Modules/FindOpenJPEG.cmake index a6c28be6782..20d1994c7ba 100644 --- a/build_files/cmake/Modules/FindOpenJPEG.cmake +++ b/build_files/cmake/Modules/FindOpenJPEG.cmake @@ -41,12 +41,10 @@ FIND_PATH(OPENJPEG_INCLUDE_DIR ${_openjpeg_SEARCH_DIRS} PATH_SUFFIXES include - include/openjpeg-1.5 ) FIND_LIBRARY(OPENJPEG_LIBRARY NAMES - openjpeg openjp2 HINTS ${_openjpeg_SEARCH_DIRS} diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index ddea41675c2..6e2691881eb 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -448,7 +448,7 @@ function(setup_liblinks if(WITH_IMAGE_OPENEXR) target_link_libraries(${target} ${OPENEXR_LIBRARIES}) endif() - if(WITH_IMAGE_OPENJPEG AND WITH_SYSTEM_OPENJPEG) + if(WITH_IMAGE_OPENJPEG) target_link_libraries(${target} ${OPENJPEG_LIBRARIES}) endif() if(WITH_CODEC_FFMPEG) diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index d3267a09aff..8562b8536a2 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -168,7 +168,6 @@ endif() if(WITH_IMAGE_OPENJPEG OR WITH_CODEC_FFMPEG) # use openjpeg from libdir that is linked into ffmpeg set(OPENJPEG ${LIBDIR}/openjpeg) - set(WITH_SYSTEM_OPENJPEG ON) set(OPENJPEG_INCLUDE_DIRS ${OPENJPEG}/include) set(OPENJPEG_LIBRARIES ${OPENJPEG}/lib/libopenjp2.a) endif() |