diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-21 21:40:55 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-21 21:41:05 (GMT) |
| commit | a6706e3a7850aa3095e8c3530417cfdcf7236e96 (patch) | |
| tree | 3e9decb56f0c0f7b936dc2e411d1245bafbaf8df /config/cmake_ext_mod | |
| parent | 7daf7d4a0bf63fa811a16306b88ccd1b21b9dc16 (diff) | |
| download | hdf5-a6706e3a7850aa3095e8c3530417cfdcf7236e96.zip hdf5-a6706e3a7850aa3095e8c3530417cfdcf7236e96.tar.gz hdf5-a6706e3a7850aa3095e8c3530417cfdcf7236e96.tar.bz2 | |
Merge changes from develop for CMake and Java
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/CTestCustom.cmake | 2 | ||||
| -rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/CTestCustom.cmake b/config/cmake_ext_mod/CTestCustom.cmake index 4e292a7..2d72e8d 100644 --- a/config/cmake_ext_mod/CTestCustom.cmake +++ b/config/cmake_ext_mod/CTestCustom.cmake @@ -5,7 +5,7 @@ set (CTEST_CUSTOM_WARNING_EXCEPTION ".*note.*expected.*void.*but argument is of type.*volatile.*" ".*src.SZIP.*:[ \t]*warning.*" ".*src.ZLIB.*:[ \t]*warning.*" - ".*jpeg.src.*:[ \t]*warning.*" + ".*src.JPEG.*:[ \t]*warning.*" ".*POSIX name for this item is deprecated.*" ".*disabling jobserver mode.*" ".*warning.*implicit declaration of function.*" diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index 6440c81..6e78ba5 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/runTest.cmake @@ -163,7 +163,7 @@ endif () # if the output file needs Modified text removed if (TEST_MASK_MOD) file (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) - string (REGEX REPLACE "Modified:[^\n]+\n" "Modified: XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}") + string (REGEX REPLACE "Modified:[^\n]+\n" "Modified: XXXX-XX-XX XX:XX:XX XXX\n" TEST_STREAM "${TEST_STREAM}") file (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") endif () |