diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-04 02:57:04 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-09-04 02:57:04 (GMT) |
| commit | d68991eec0cbb459422bb09017c6215259f57fff (patch) | |
| tree | 8373b5879f02777c8e46a56c476098d9d07936da /config/cmake | |
| parent | 1a119d500af81e3e0a121943443e916dc11f1aba (diff) | |
| download | hdf5-d68991eec0cbb459422bb09017c6215259f57fff.zip hdf5-d68991eec0cbb459422bb09017c6215259f57fff.tar.gz hdf5-d68991eec0cbb459422bb09017c6215259f57fff.tar.bz2 | |
[svn-r19350] Description:
Bring r19328:19349 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.6.4 (amazon) w/debug & production
(h5committest not needed on this branch)
Diffstat (limited to 'config/cmake')
| -rwxr-xr-x | config/cmake/CTestCustom.ctest | 4 | ||||
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/config/cmake/CTestCustom.ctest b/config/cmake/CTestCustom.ctest index d55a559..c1538c0 100755 --- a/config/cmake/CTestCustom.ctest +++ b/config/cmake/CTestCustom.ctest @@ -2,8 +2,8 @@ SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500) SET (CTEST_CUSTOM_WARNING_EXCEPTION ${CTEST_CUSTOM_WARNING_EXCEPTION} - "H5detect.c.[0-9]+. : warning C4090:" - "testhdf5.h.[0-9]+. : warning C4005:" + "H5detect.c.[0-9]+.[ ]*: warning C4090:" + "testhdf5.h.[0-9]+.[ ]*: warning C4005:" "disabling jobserver mode" ) diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 3a16856..1318e90 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -563,8 +563,6 @@ ENDIF (INLINE_TEST___inline__) # Check how to print a Long Long integer #----------------------------------------------------------------------------- IF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown") - SET (H5_PRINTF_LL_WIDTH "H5_PRINTF_LL_WIDTH") - IF (H5_PRINTF_LL_WIDTH MATCHES "^H5_PRINTF_LL_WIDTH$") SET (PRINT_LL_FOUND 0) MESSAGE (STATUS "Checking for appropriate format for 64 bit long:") FOREACH (HDF5_PRINTF_LL l64 l L q I64 ll) @@ -600,7 +598,6 @@ IF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown") "Width for printf for type `long long' or `__int64', us. `ll" ) ENDIF (PRINT_LL_FOUND) - ENDIF (H5_PRINTF_LL_WIDTH MATCHES "^H5_PRINTF_LL_WIDTH$") ENDIF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown") # ---------------------------------------------------------------------- |