Skip to content

Commit a70b8f1

Browse files
committed
Increase cmake_minimum_required 3.5 -> 3.10
Closes: #1606 Signed-off-by: Thomas Bracht Laumann Jespersen <[email protected]>
1 parent 1ad9bec commit a70b8f1

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# For this purpose you can define a CMake var: OPENJPEG_NAMESPACE to whatever you like
88
# e.g.:
99
# set(OPENJPEG_NAMESPACE "GDCMOPENJPEG")
10-
cmake_minimum_required(VERSION 3.5...3.31.5)
10+
cmake_minimum_required(VERSION 3.10...3.31.5)
1111

1212
if(NOT OPENJPEG_NAMESPACE)
1313
set(OPENJPEG_NAMESPACE "OPENJPEG")

tests/nonregression/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NON-REGRESSION TESTS ON THIS DATASET LOCATED ${OPJ_DATA_ROOT}/input/nonregression
22

3-
cmake_minimum_required(VERSION 3.5)
3+
cmake_minimum_required(VERSION 3.10)
44

55
file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Temporary)
66

@@ -61,7 +61,7 @@ set(BLACKLIST_JPEG2000
6161
broken3.jp2
6262
broken4.jp2
6363
edf_c2_20.jp2 #may look ok as per kdu_jp2info, but inspection it reveals that the transformation value is out of range
64-
gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2
64+
gdal_fuzzer_assert_in_opj_j2k_read_SQcd_SQcc.patch.jp2
6565
gdal_fuzzer_check_comp_dx_dy.jp2
6666
gdal_fuzzer_check_number_of_tiles.jp2
6767
gdal_fuzzer_unchecked_numresolutions.jp2
@@ -122,7 +122,7 @@ foreach(INPUT_FILENAME ${OPJ_DATA_NR_LIST})
122122
PROPERTIES WILL_FAIL TRUE)
123123

124124
else()
125-
125+
126126
# Compare the dump output with the baseline
127127
add_test(NAME NR-${INPUT_FILENAME_NAME}-compare_dump2base
128128
COMMAND compare_dump_files
@@ -418,7 +418,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
418418
set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-jpylyser PROPERTIES
419419
DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-encode
420420
PASS_REGULAR_EXPRESSION "<isValidJP2>True</isValidJP2>"
421-
)
421+
)
422422
endif()
423423
endif(JPYLYZER_EXECUTABLE)
424424

@@ -438,7 +438,7 @@ foreach(OPJ_TEST_CMD_LINE ${OPJ_TEST_CMD_LINE_LIST})
438438
)
439439
set_tests_properties(NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-compare PROPERTIES
440440
DEPENDS NR-ENC-${INPUT_FILENAME_NAME}-${IT_TEST_ENC}-lossless-decode
441-
)
441+
)
442442
endif()
443443
endif()
444444
endif()

0 commit comments

Comments
 (0)