diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-06-15 22:48:27 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-15 22:48:27 (GMT) |
| commit | 16b1f35e7f5cff85a141148a6f8aa02c23f08fd7 (patch) | |
| tree | c5f80197bda39eaf1026de538f343e498b3f8258 /config | |
| parent | c2e3e9f63a1872a8f27aac18f0ff72405746b8ce (diff) | |
| download | hdf5-16b1f35e7f5cff85a141148a6f8aa02c23f08fd7.zip hdf5-16b1f35e7f5cff85a141148a6f8aa02c23f08fd7.tar.gz hdf5-16b1f35e7f5cff85a141148a6f8aa02c23f08fd7.tar.bz2 | |
Some minor version text changes (#3134)
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/runTest.cmake | 16 | ||||
| -rw-r--r-- | config/cmake/scripts/HDF5config.cmake | 2 |
2 files changed, 1 insertions, 17 deletions
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index 0d05424..1e7f72d 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -214,14 +214,6 @@ 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) # 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 @@ -289,14 +281,6 @@ 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) # 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 ( diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 30d187e..4a49cef 100644 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -217,7 +217,7 @@ endif () ##### Following controls source update ##### #set (LOCAL_UPDATE "TRUE") set (REPOSITORY_URL "https://github.com/HDFGroup/hdf5.git") -set (REPOSITORY_BRANCH "develop") +set (REPOSITORY_BRANCH "hdf5_1_14") #uncomment to use a compressed source file: *.tar on linux or mac *.zip on windows #set(CTEST_USE_TAR_SOURCE "${CTEST_SOURCE_VERSION}") |