diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2010-09-02 21:00:43 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2010-09-02 21:00:43 (GMT) |
| commit | add9f142d44adef9bf3df151326b30befea48f47 (patch) | |
| tree | 404a7b16ca3b4feae5729010aa42d0e91ad2c6dd /config | |
| parent | d9e84977b8220854457c92830b544f5e06e09c73 (diff) | |
| download | hdf5-add9f142d44adef9bf3df151326b30befea48f47.zip hdf5-add9f142d44adef9bf3df151326b30befea48f47.tar.gz hdf5-add9f142d44adef9bf3df151326b30befea48f47.tar.bz2 | |
[svn-r19343] Corrected long long printf test.
Added CMake commands to allow the install of the extlibs on windows.
Updated ctest warning exception regex for VS2010
Tested: windows
Diffstat (limited to 'config')
| -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") # ---------------------------------------------------------------------- |