summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-02-21 21:14:42 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-02-21 21:14:42 (GMT)
commit3f3e1520d5fa494c80da6bf42bab906d24c1d864 (patch)
tree53674c81d273515ede8750a4dbf3078ec4e818ea
parent399ef726f092237abb1039960edf837a38600813 (diff)
downloadhdf5-3f3e1520d5fa494c80da6bf42bab906d24c1d864.zip
hdf5-3f3e1520d5fa494c80da6bf42bab906d24c1d864.tar.gz
hdf5-3f3e1520d5fa494c80da6bf42bab906d24c1d864.tar.bz2
CMake cleanup
-rw-r--r--config/cmake_ext_mod/CTestCustom.cmake2
-rw-r--r--config/cmake_ext_mod/runTest.cmake2
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 ()