Use OpenJPEG 2.5 in external project.

rordenlab · Feb 8, 2025 · 7f3cbc9 · 7f3cbc9
1 parent c26502a
commit 7f3cbc9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.5)
+cmake_minimum_required(VERSION 3.10)
 
 if(COMMAND CMAKE_POLICY)
     CMAKE_POLICY(SET CMP0003 NEW)

diff --git a/SuperBuild/External-CLOUDFLARE-ZLIB.cmake b/SuperBuild/External-CLOUDFLARE-ZLIB.cmake
@@ -7,8 +7,9 @@ ExternalProject_Add(zlib
     BINARY_DIR cloudflare-zlib-build
     CMAKE_ARGS
         -Wno-dev
-        ${EXTERNAL_PROJECT_BUILD_TYPE_CMAKE_ARGS}
-        ${OSX_ARCHITECTURES}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
         # Compiler settings
         -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
         # Install directories

diff --git a/SuperBuild/External-OPENJPEG.cmake b/SuperBuild/External-OPENJPEG.cmake
@@ -1,4 +1,4 @@
-set(OPENJPEG_TAG  v2.1-static) # version v2.1-static
+set(OPENJPEG_TAG  openjpeg-2.5)
 
 ExternalProject_Add(openjpeg
     GIT_REPOSITORY "https://github.com/ningfei/openjpeg.git"
@@ -8,12 +8,14 @@ ExternalProject_Add(openjpeg
     CMAKE_ARGS
         -Wno-dev
         --no-warn-unused-cli
-        ${EXTERNAL_PROJECT_BUILD_TYPE_CMAKE_ARGS}
-        ${OSX_ARCHITECTURES}
-        # Compiler settings
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+	    # Compiler settings
         -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${DEP_INSTALL_DIR}
 )
 
-set(OpenJPEG_DIR ${DEP_INSTALL_DIR}/lib/openjpeg-2.1)
+include(GNUInstallDirs)
+set(OpenJPEG_DIR ${DEP_INSTALL_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/${OPENJPEG_TAG})
diff --git a/SuperBuild/External-YAML-CPP.cmake b/SuperBuild/External-YAML-CPP.cmake
@@ -8,9 +8,10 @@ ExternalProject_Add(yaml-cpp
     CMAKE_ARGS
         -Wno-dev
         --no-warn-unused-cli
-        ${EXTERNAL_PROJECT_BUILD_TYPE_CMAKE_ARGS}
-        ${OSX_ARCHITECTURES}
-        # Compiler settings
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
+	    # Compiler settings
         -DCMAKE_C_COMPILER:FILEPATH=${CMAKE_C_COMPILER}
         -DCMAKE_CXX_COMPILER:FILEPATH=${CMAKE_CXX_COMPILER}
         # Install directories

diff --git a/SuperBuild/SuperBuild.cmake b/SuperBuild/SuperBuild.cmake
@@ -147,8 +147,9 @@ ExternalProject_Add(console
     CMAKE_ARGS
         -Wno-dev
         --no-warn-unused-cli
-        ${EXTERNAL_PROJECT_BUILD_TYPE_CMAKE_ARGS}
-        ${OSX_ARCHITECTURES}
+        -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+        -DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
+        -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
         # Install directories
         -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_BINARY_DIR}
         # Compiler settings