diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2013-08-19 16:51:32 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2013-08-19 16:51:32 (GMT) |
| commit | 5c84b510304d5ae23eb1a7bedda8ce5eb816e414 (patch) | |
| tree | 60c0a303691378612f48de4a174a34b9aaf45328 /bin | |
| parent | 6e58f671ec62120246a94101a80a47259ffb96c3 (diff) | |
| download | hdf5-5c84b510304d5ae23eb1a7bedda8ce5eb816e414.zip hdf5-5c84b510304d5ae23eb1a7bedda8ce5eb816e414.tar.gz hdf5-5c84b510304d5ae23eb1a7bedda8ce5eb816e414.tar.bz2 | |
[svn-r24024] JAVA-1714: CMake packaging for macs improved
HDFFV-7989: h5dump any_path and help text grouping
Added cygwin-64 support
Merged from trunk, tested local linux
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/cmakehdf5 | 4 | ||||
| -rwxr-xr-x | bin/config.guess | 8 |
2 files changed, 6 insertions, 6 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/bin/config.guess b/bin/config.guess index f32079a..03fe473 100755 --- a/bin/config.guess +++ b/bin/config.guess @@ -778,9 +778,9 @@ EOF echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; esac exit ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; + i*:CYGWIN*:* | x*:CYGWIN*:*) + echo ${UNAME_MACHINE}-pc-cygwin + exit ;; *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; @@ -815,7 +815,7 @@ EOF i*:UWIN*:*) echo ${UNAME_MACHINE}-pc-uwin exit ;; - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) + amd64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; p*:CYGWIN*:*) |