diff options
| author | Allen Winter <allen.winter@kdab.com> | 2020-11-22 11:03:45 -0500 |
|---|---|---|
| committer | Allen Winter <allen.winter@kdab.com> | 2020-11-22 11:03:45 -0500 |
| commit | 316f607addf071ba3e6c14b8d862af6cdd9aede5 (patch) | |
| tree | f1e0ab0ed5bbf13ad7e744945087a58fe3c4be46 /cmake | |
| parent | d8fb0872a471c6cac76939551ef083d443584792 (diff) | |
| parent | 47f9a47ab0f3cad8d7d8de3960319de46a7a446c (diff) | |
| download | libical-git-316f607addf071ba3e6c14b8d862af6cdd9aede5.tar.gz | |
Merge branch '3.0'
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/run_test.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/run_test.cmake b/cmake/run_test.cmake index 5aa5abbf..db6c5c4d 100644 --- a/cmake/run_test.cmake +++ b/cmake/run_test.cmake @@ -28,8 +28,13 @@ if(test_not_successful) message(SEND_ERROR "Unable to run test '${test_cmd}': ${err} : shell output: ${test_not_successful}!") endif() +#cmake v3.14 compare_files can ignore line endings +set(ignore_eol "") +if(NOT CMAKE_VERSION VERSION_LESS 3.14) + set(ignore_eol "--ignore-eol") +endif() execute_process( - COMMAND ${CMAKE_COMMAND} -E compare_files ${output_blessed} ${output_test} + COMMAND ${CMAKE_COMMAND} -E compare_files ${ignore_eol} ${output_blessed} ${output_test} RESULT_VARIABLE test_not_successful ERROR_VARIABLE err ) |