diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-08-13 17:50:56 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-08-13 17:50:56 (GMT) |
| commit | 8b2f7c2183f2c60ace5750995befdfb080fc064a (patch) | |
| tree | 7880b04f2137c5ee27cc8ce144c81a951c1a9d32 | |
| parent | e8d0919d43fe2a8a4d1aa2984d97d6e8d12a4b7d (diff) | |
| download | hdf5-8b2f7c2183f2c60ace5750995befdfb080fc064a.zip hdf5-8b2f7c2183f2c60ace5750995befdfb080fc064a.tar.gz hdf5-8b2f7c2183f2c60ace5750995befdfb080fc064a.tar.bz2 | |
[svn-r24003] Remove check for GetConsoleScreenBuffer in CYGWIN (false positive).
Updated CDash site name in cmake script.
| -rwxr-xr-x | bin/cmakehdf5 | 4 | ||||
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/bin/cmakehdf5 b/bin/cmakehdf5 index 2480497..874df5d 100755 --- a/bin/cmakehdf5 +++ b/bin/cmakehdf5 @@ -76,7 +76,7 @@ set (CTEST_MAX_N 8) set (LOCAL_NO_SUBMIT TRUE) # No CDash submit. set (MODEL "Experimental") set (CDASH_LOCAL TRUE) -set (SITE_BUILDNAME_SUFFIX "SHARED") +set (SITE_BUILDNAME_SUFFIX "cmakehdf5") # -- URL set for internal check, default is to not update set (LOCAL_SKIP_UPDATE TRUE) @@ -225,7 +225,7 @@ EOF # Run ctest -ctest -S $cfgfile -C Release -O ctest.log +ctest -S $cfgfile -C Release -V -O ctest.log exit_code=$? if [ $exit_code = 0 ]; then echo Complete without error diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index cce71c7..d4b23eb 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -172,7 +172,9 @@ IF (WINDOWS) IF (NOT MINGW) SET (H5_HAVE_GETHOSTNAME 1) ENDIF (NOT MINGW) - SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1) + IF (NOT UNIX AND NOT CYGWIN AND NOT MINGW) + SET (H5_HAVE_GETCONSOLESCREENBUFFERINFO 1) + ENDIF (NOT UNIX AND NOT CYGWIN AND NOT MINGW) SET (H5_HAVE_FUNCTION 1) SET (H5_GETTIMEOFDAY_GIVES_TZ 1) SET (H5_HAVE_TIMEZONE 1) |