Merge changes from develop mostly cmake 3.12 minimum version

This commit is contained in:
Allen Byrne
2020-02-23 11:55:47 -06:00
parent a6706e3a78
commit 9ed096fb39
88 changed files with 481 additions and 347 deletions

View File

@@ -102,7 +102,7 @@ if (TEST_CHECKUB STREQUAL "YES")
# now compare the outputs
EXECUTE_PROCESS (
COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
COMMAND ${CMAKE_COMMAND} -E compare_files ${CMAKE_IGNORE_EOL} ${TEST_HFILE}-ub.cmp ${TEST_HFILE}.cmp
RESULT_VARIABLE TEST_RESULT
)