diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-09-03 00:31:29 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-03 00:31:29 (GMT) |
commit | c8fdd92cd4d53e5343b475b85c013de60ba13555 (patch) | |
tree | 6f852f5c3040bacbad3040fa00022955e78b63ee /config/cmake/runTest.cmake | |
parent | 6e8aaab1b43be06b4fde60ad5bd583a8a08f882a (diff) | |
download | hdf5-c8fdd92cd4d53e5343b475b85c013de60ba13555.zip hdf5-c8fdd92cd4d53e5343b475b85c013de60ba13555.tar.gz hdf5-c8fdd92cd4d53e5343b475b85c013de60ba13555.tar.bz2 |
Update CMake code to 3.18 minimum version (#2080)
* Update CMake code to 3.18 minimum version
* Updated release note
Diffstat (limited to 'config/cmake/runTest.cmake')
-rw-r--r-- | config/cmake/runTest.cmake | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index ad72a9e..12b4818 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -212,19 +212,19 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - if (WIN32) - configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) - if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") - file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) - endif () - #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) - #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") - endif () + # if (WIN32) # no longer needed for CMake > 3.15 + # configure_file(${TEST_FOLDER}/${TEST_REFERENCE} ${TEST_FOLDER}/${TEST_REFERENCE}.tmp NEWLINE_STYLE CRLF) + # if (EXISTS "${TEST_FOLDER}/${TEST_REFERENCE}.tmp") + # file(RENAME ${TEST_FOLDER}/${TEST_REFERENCE}.tmp ${TEST_FOLDER}/${TEST_REFERENCE}) + # endif () + # #file (READ ${TEST_FOLDER}/${TEST_REFERENCE} TEST_STREAM) + # #file (WRITE ${TEST_FOLDER}/${TEST_REFERENCE} "${TEST_STREAM}") + # endif () if (NOT TEST_SORT_COMPARE) # now compare the output with the reference execute_process ( - COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE} + COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE} RESULT_VARIABLE TEST_COMPARE_RESULT ) else () @@ -287,18 +287,18 @@ if (NOT TEST_SKIP_COMPARE) file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) list (LENGTH TEST_STREAM test_len) if (test_len GREATER 0) - if (WIN32) - configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) - if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") - file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) - endif () - #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) - #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}") - endif () + # if (WIN32) # no longer needed for CMake > 3.15 + # configure_file(${TEST_FOLDER}/${TEST_ERRREF} ${TEST_FOLDER}/${TEST_ERRREF}.tmp NEWLINE_STYLE CRLF) + # if (EXISTS "${TEST_FOLDER}/${TEST_ERRREF}.tmp") + # file(RENAME ${TEST_FOLDER}/${TEST_ERRREF}.tmp ${TEST_FOLDER}/${TEST_ERRREF}) + # endif () + # #file (READ ${TEST_FOLDER}/${TEST_ERRREF} TEST_STREAM) + # #file (WRITE ${TEST_FOLDER}/${TEST_ERRREF} "${TEST_STREAM}") + # endif () # now compare the error output with the error reference execute_process ( - COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF} + COMMAND ${CMAKE_COMMAND} -E compare_files --ignore-eol ${TEST_FOLDER}/${TEST_OUTPUT}.err ${TEST_FOLDER}/${TEST_ERRREF} RESULT_VARIABLE TEST_ERRREF_RESULT ) if (TEST_ERRREF_RESULT) |