diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2024-01-08 19:00:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-08 19:00:53 +0100 |
| commit | b0e966ee18ec8338805d3ec2dce692b2a26b5407 (patch) | |
| tree | 2e4328dd3a3c28e35c553be782094c041439ecc3 /src | |
| parent | 406e1840ffbddacec1eeb58ca445f59441314e61 (diff) | |
| parent | 65d0326e5ac8db97314e1c211a20183f939bebb5 (diff) | |
Merge pull request #1503 from domin144/drop_cmake_less_3.5
CMake: drop support for cmake < 3.5
Diffstat (limited to 'src')
| -rw-r--r-- | src/bin/jp2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/lib/openjp2/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/lib/openjpip/CMakeLists.txt | 4 |
3 files changed, 3 insertions, 9 deletions
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 |