Commit 7067a9f7 authored by Julien Osman's avatar Julien Osman
Browse files

ENH: Upgrade OPENJPEG to 2.5.0

parent 23bc0d4e
Pipeline #11232 failed with stages
in 99 minutes and 50 seconds
......@@ -38,8 +38,8 @@ ADD_SUPERBUILD_CMAKE_VAR(OPENJPEG PNG_LIBRARY)
ExternalProject_Add(OPENJPEG
PREFIX OPENJPEG
URL "https://github.com/uclouvain/openjpeg/archive/v2.3.1.tar.gz"
URL_MD5 3b9941dc7a52f0376694adb15a72903f
URL "https://github.com/uclouvain/openjpeg/archive/v2.5.0.tar.gz"
URL_MD5 5cbb822a1203dd75b85639da4f4ecaab
DOWNLOAD_NAME openjpeg_v2.3.1.tar.gz
BINARY_DIR ${OPENJPEG_SB_BUILD_DIR}
INSTALL_DIR ${SB_INSTALL_PREFIX}
......
diff -burN openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/CMakeLists.txt openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/CMakeLists.txt
--- openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/CMakeLists.txt 2016-07-01 12:37:01.000000000 +0200
+++ openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/CMakeLists.txt 2016-07-01 12:37:20.000000000 +0200
@@ -153,7 +153,7 @@
endif()
if (APPLE)
- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
+# list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${OPENJPEG_INSTALL_LIB_DIR}")
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
endif()
diff -burN openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/thirdparty/CMakeLists.txt openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/thirdparty/CMakeLists.txt
--- openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592.orig/thirdparty/CMakeLists.txt 2016-07-01 12:37:01.000000000 +0200
+++ openjpeg-d0babeb6f6cdd1887308137df37bb2b4724a6592/thirdparty/CMakeLists.txt 2016-07-01 12:38:10.000000000 +0200
@@ -84,7 +84,7 @@
set(OPJ_HAVE_LCMS_H 0 PARENT_SCOPE)
set(OPJ_HAVE_LIBLCMS 0 PARENT_SCOPE)
-if( BUILD_THIRDPARTY)
+if( BUILD_THIRDPARTY_LCMS )
# Try to build lcms2
message(STATUS "We will build LCMS2 lib from thirdparty")
add_subdirectory(liblcms2)
@@ -92,7 +92,7 @@
set(LCMS_INCLUDE_DIRNAME ${OPENJPEG_SOURCE_DIR}/thirdparty/liblcms2/include PARENT_SCOPE) #
set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
-else(BUILD_THIRDPARTY)
+else()
find_package(LCMS2)
if(LCMS2_FOUND)
message(STATUS "Your system seems to have a LCMS2 lib available, we will use it")
@@ -115,7 +115,7 @@
message(STATUS "LCMS2 or LCMS lib not found, activate BUILD_THIRDPARTY if you want build it")
endif(LCMS_FOUND)
endif(LCMS2_FOUND)
-endif(BUILD_THIRDPARTY)
+endif()
#------------
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment