From 157a3d840884abe5020b1a8b94576a7447063385 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 14 Nov 2017 21:45:09 +1100 Subject: [PATCH] Changed cmake version test to allow for cmake 2.8.11.x --- src/bin/jp2/CMakeLists.txt | 2 +- src/lib/openjp2/CMakeLists.txt | 2 +- src/lib/openjp3d/CMakeLists.txt | 2 +- src/lib/openjpip/CMakeLists.txt | 2 +- src/lib/openjpwl/CMakeLists.txt | 2 +- src/lib/openmj2/CMakeLists.txt | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt index 4324c36d..4d4bd952 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt @@ -44,7 +44,7 @@ endif() # Loop over all executables: foreach(exe opj_decompress opj_compress opj_dump) add_executable(${exe} ${exe}.c ${common_SRCS}) - if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") + if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(${exe} PRIVATE ${OPENJP2_COMPILE_OPTIONS}) endif() target_link_libraries(${exe} ${OPENJPEG_LIBRARY_NAME} diff --git a/src/lib/openjp2/CMakeLists.txt b/src/lib/openjp2/CMakeLists.txt index f8990ccf..b2714858 100644 --- a/src/lib/openjp2/CMakeLists.txt +++ b/src/lib/openjp2/CMakeLists.txt @@ -107,7 +107,7 @@ if(UNIX) target_link_libraries(${OPENJPEG_LIBRARY_NAME} m) endif() set_target_properties(${OPENJPEG_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(${OPENJPEG_LIBRARY_NAME} PRIVATE ${OPENJP2_COMPILE_OPTIONS}) endif() diff --git a/src/lib/openjp3d/CMakeLists.txt b/src/lib/openjp3d/CMakeLists.txt index 26bf1788..b0469af1 100644 --- a/src/lib/openjp3d/CMakeLists.txt +++ b/src/lib/openjp3d/CMakeLists.txt @@ -27,7 +27,7 @@ if(UNIX) target_link_libraries(${OPENJP3D_LIBRARY_NAME} m) endif() set_target_properties(${OPENJP3D_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(${OPENJP3D_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) endif() diff --git a/src/lib/openjpip/CMakeLists.txt b/src/lib/openjpip/CMakeLists.txt index 7348b1ef..b3cb8ce8 100644 --- a/src/lib/openjpip/CMakeLists.txt +++ b/src/lib/openjpip/CMakeLists.txt @@ -62,7 +62,7 @@ endif() add_library(openjpip ${OPENJPIP_SRCS} ${LOCAL_SRCS}) set_target_properties(openjpip PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(openjpip PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) endif() target_link_libraries(openjpip ${OPENJPEG_LIBRARY_NAME}) diff --git a/src/lib/openjpwl/CMakeLists.txt b/src/lib/openjpwl/CMakeLists.txt index 9e2ace75..1b33adbe 100644 --- a/src/lib/openjpwl/CMakeLists.txt +++ b/src/lib/openjpwl/CMakeLists.txt @@ -51,7 +51,7 @@ if(UNIX) endif() set_target_properties(openjpwl PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(openjpwl PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) endif() diff --git a/src/lib/openmj2/CMakeLists.txt b/src/lib/openmj2/CMakeLists.txt index 2ee1764b..25294b20 100644 --- a/src/lib/openmj2/CMakeLists.txt +++ b/src/lib/openmj2/CMakeLists.txt @@ -46,7 +46,7 @@ if(UNIX) target_link_libraries(${OPENMJ2_LIBRARY_NAME} m) endif() set_target_properties(${OPENMJ2_LIBRARY_NAME} PROPERTIES ${OPENJPEG_LIBRARY_PROPERTIES}) -if(${CMAKE_VERSION} VERSION_GREATER "2.8.11") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.12") target_compile_options(${OPENMJ2_LIBRARY_NAME} PRIVATE ${OPENJPEG_LIBRARY_COMPILE_OPTIONS}) endif()