diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2020-02-21 22:05:51 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2020-02-21 22:05:51 (GMT) |
commit | 909f9ee6d02d6b5919e20600428ebdf23acc0bea (patch) | |
tree | a90ed3dc70aafa07f47a1a60de56eae2a92eb094 /config/cmake_ext_mod | |
parent | 0175224cb8210f4992b576a56bb9f66ca97af9c1 (diff) | |
parent | 380fe7cfdfd98461cb1bff54bad4de0ee9904ad6 (diff) | |
download | hdf5-909f9ee6d02d6b5919e20600428ebdf23acc0bea.zip hdf5-909f9ee6d02d6b5919e20600428ebdf23acc0bea.tar.gz hdf5-909f9ee6d02d6b5919e20600428ebdf23acc0bea.tar.bz2 |
Merge pull request #2388 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '380fe7cfdfd98461cb1bff54bad4de0ee9904ad6':
Fix always true issue because member is not dynamically allocated
CMake cleanup
HDFFV-11032 fix JNI call
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 () |