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/grepTest.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/grepTest.cmake')
| -rw-r--r-- | config/cmake/grepTest.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake index 3b0baf5..9e80956 100644 --- a/config/cmake/grepTest.cmake +++ b/config/cmake/grepTest.cmake @@ -49,9 +49,7 @@ endif () if (TEST_ENV_VAR) set (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") - if (CMAKE_VERSION VERSION_GREATER_EQUAL "3.15.0") - message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}") - endif () + message (TRACE "ENV:${TEST_ENV_VAR}=$ENV{${TEST_ENV_VAR}}") endif () # run the test program, capture the stdout/stderr and the result var @@ -112,7 +110,7 @@ if (TEST_ERRREF) 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 () |