summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Wójt <domin144@o2.pl>2024-01-08 18:07:04 +0100
committerDominik Wójt <domin144@o2.pl>2024-01-08 18:13:14 +0100
commit65d0326e5ac8db97314e1c211a20183f939bebb5 (patch)
tree2e4328dd3a3c28e35c553be782094c041439ecc3
parent406e1840ffbddacec1eeb58ca445f59441314e61 (diff)
CMake: drop support for cmake < 3.5
Compatibility for cmake version < 3.5 is now deprecated in cmake and specifing version below 3.5 in cmake_minimum_required produces a warning.[1] [1] https://cmake.org/cmake/help/latest/release/3.27.html#deprecated-and-removed-features
-rw-r--r--CMakeLists.txt35
-rw-r--r--src/bin/jp2/CMakeLists.txt4
-rw-r--r--src/lib/openjp2/CMakeLists.txt4
-rw-r--r--src/lib/openjpip/CMakeLists.txt4
-rw-r--r--tests/nonregression/CMakeLists.txt2
-rw-r--r--tools/ctest_scripts/travis-ci.cmake2
6 files changed, 11 insertions, 40 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6dd7080..0ee16038 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,14 +7,7 @@
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
# e.g.:
# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
-cmake_minimum_required(VERSION 2.8.5)
-
-if(COMMAND CMAKE_POLICY)
- cmake_policy(SET CMP0003 NEW)
- if (NOT (${CMAKE_VERSION} VERSION_LESS 3.0))
- cmake_policy(SET CMP0042 NEW)
- endif()
-endif()
+cmake_minimum_required(VERSION 3.5)
if(NOT OPENJPEG_NAMESPACE)
set(OPENJPEG_NAMESPACE "OPENJPEG")
@@ -126,12 +119,6 @@ if(NOT OPENJPEG_INSTALL_PACKAGE_DIR)
endif()
if (APPLE)
- if (${CMAKE_VERSION} VERSION_LESS 3.0)
- # For cmake >= 3.0, we turn on CMP0042 and
- # https://cmake.org/cmake/help/v3.0/policy/CMP0042.html mentions
- # "Projects wanting @rpath in a target’s install name may remove any setting of the INSTALL_NAME_DIR and CMAKE_INSTALL_NAME_DIR variables"
- list(APPEND OPENJPEG_LIBRARY_PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}")
- endif()
option(OPJ_USE_DSYMUTIL "Call dsymutil on binaries after build." OFF)
endif()
@@ -304,21 +291,11 @@ endif()
#-----------------------------------------------------------------------------
# install all targets referenced as OPENJPEGTargets (relocatable with CMake 3.0+)
install(EXPORT OpenJPEGTargets DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR})
-if (${CMAKE_VERSION} VERSION_LESS 3.0)
- set(PACKAGE_INIT)
- set(PACKAGE_CMAKE_INSTALL_INCLUDEDIR ${CMAKE_INSTALL_FULL_INCLUDEDIR})
- configure_file( ${${OPENJPEG_NAMESPACE}_SOURCE_DIR}/cmake/OpenJPEGConfig.cmake.in
- ${${OPENJPEG_NAMESPACE}_BINARY_DIR}/OpenJPEGConfig.cmake
- @ONLY
- )
-else()
- include(CMakePackageConfigHelpers)
- configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/OpenJPEGConfig.cmake.in
- ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
- INSTALL_DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
- PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
-endif()
-
+include(CMakePackageConfigHelpers)
+configure_package_config_file(${CMAKE_CURRENT_LIST_DIR}/cmake/OpenJPEGConfig.cmake.in
+ ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
+ INSTALL_DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
+ PATH_VARS CMAKE_INSTALL_INCLUDEDIR)
install( FILES ${OPENJPEG_BINARY_DIR}/OpenJPEGConfig.cmake
DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
)
diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt
index 29b4dd20..26156bcb 100644
--- a/src/bin/jp2/CMakeLists.txt
+++ b/src/bin/jp2/CMakeLists.txt
@@ -44,9 +44,7 @@ endif()
# Loop over all executables:
foreach(exe opj_decompress opj_compress opj_dump)
add_executable(${exe} ${exe}.c ${common_SRCS})
- if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
- target_compile_options(${exe} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
- endif()
+ target_compile_options(${exe} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME}
${PNG_LIBNAME} ${TIFF_LIBNAME} ${LCMS_LIBNAME}
)
diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt
index 8fda14dc..99cf580a 100644
--- a/src/lib/openjp2/CMakeLists.txt
+++ b/src/lib/openjp2/CMakeLists.txt
@@ -109,9 +109,7 @@ if(UNIX)
target_link_libraries(${OPENJPEG_LIBRARY_NAME} m)
endif()
set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
- target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
-endif()
+target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJP2_COMPILE_OPTIONS})
# Install library
install(TARGETS ${INSTALL_LIBS}
diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt
index aace36d4..e9d81930 100644
--- a/src/lib/openjpip/CMakeLists.txt
+++ b/src/lib/openjpip/CMakeLists.txt
@@ -62,9 +62,7 @@ endif()
add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS})
set_target_properties(openjpip
PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES})
-if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12")
- target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
-endif()
+target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS})
target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME})
if(WIN32)
# add Winsock on windows+mingw
diff --git a/tests/nonregression/CMakeLists.txt b/tests/nonregression/CMakeLists.txt
index 05fce40c..51990577 100644
--- a/tests/nonregression/CMakeLists.txt
+++ b/tests/nonregression/CMakeLists.txt
@@ -1,6 +1,6 @@
# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
-cmake_minimum_required(VERSION 2.8.7)
+cmake_minimum_required(VERSION 3.5)
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
diff --git a/tools/ctest_scripts/travis-ci.cmake b/tools/ctest_scripts/travis-ci.cmake
index b9f75fff..7d1c9f32 100644
--- a/tools/ctest_scripts/travis-ci.cmake
+++ b/tools/ctest_scripts/travis-ci.cmake
@@ -4,7 +4,7 @@
# Results will be available at: http://my.cdash.org/index.php?project=OPENJPEG
# -----------------------------------------------------------------------------
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.5)
set( ENV{LANG} en_US.UTF-8)
if($ENV{OPJ_BINARY_DIR})