diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/apple | 21 | ||||
| -rw-r--r-- | config/cmake/CTest.cmake | 289 | ||||
| -rwxr-xr-x | config/cmake/CTestCustom.cmake | 516 | ||||
| -rwxr-xr-x | config/cmake/CTestCustom.ctest | 19 | ||||
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 126 | ||||
| -rw-r--r-- | config/cmake/FindHDF5.cmake | 61 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 42 | ||||
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 59 | ||||
| -rwxr-xr-x | config/cmake/cacheinit.cmake | 32 | ||||
| -rw-r--r-- | config/cmake/grepTest.cmake | 2 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.build.in | 8 | ||||
| -rw-r--r-- | config/cmake/hdf5-config.cmake.install.in | 8 | ||||
| -rw-r--r-- | config/cmake/libhdf5.settings.cmake.in | 2 | ||||
| -rwxr-xr-x | config/cmake/mccacheinit.cmake | 58 | ||||
| -rw-r--r-- | config/cmake/runTest.cmake | 31 | ||||
| -rw-r--r-- | config/cmake/vfdTest.cmake | 13 | ||||
| -rw-r--r-- | config/examples.am | 3 | ||||
| -rw-r--r-- | config/ia64-linux-gnu | 2 | ||||
| -rw-r--r-- | config/ibm-aix | 14 | ||||
| -rw-r--r-- | config/ibm-aix6.x | 21 | ||||
| -rw-r--r-- | config/ibm-flags | 2 | ||||
| -rw-r--r-- | config/intel-flags | 14 | ||||
| -rw-r--r-- | config/linux-gnulibc1 | 10 | ||||
| -rw-r--r-- | config/lt_vers.am | 2 | ||||
| -rw-r--r-- | config/powerpc-ibm-aix5.x | 151 |
25 files changed, 1189 insertions, 317 deletions
diff --git a/config/apple b/config/apple index 10674fb..babcdad 100644 --- a/config/apple +++ b/config/apple @@ -62,6 +62,11 @@ case $CC in grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'` ;; + *icc*) + cc_version_info=`$CC $CCFLAGS $H5_CCFLAGS -V 2>&1 | grep 'Version' |\ + sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'` + ;; + *) echo "No match to get cc_version_info for $CC" ;; @@ -72,6 +77,16 @@ case $FC in fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS --version 2>&1 |\ grep 'GCC' | sed 's/\(.*(GCC) [-a-z0-9\. ]*\).*/\1/'` ;; + + *ifc*|*ifort*) + fc_version_info=`$FC $FCFLAGS $H5_FCFLAGS -V 2>&1 | grep 'Version' |\ + sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'` + ;; + + *) + echo "No match to get fc_version_info for $FC" + ;; + esac # get c++ version info @@ -80,6 +95,12 @@ case $CXX in cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS --version 2>&1 |\ grep 'GCC' | sed 's/.*\((GCC) [-a-z0-9\. ]*.*\)/\1/'` ;; + + *icpc*) + cxx_version_info=`$CXX $CXXFLAGS $H5_CXXFLAGS -V 2>&1 | grep 'Version' |\ + sed 's/\(Intel.* Compiler\).*\( Version [a-z0-9\.]*\).*\( Build [0-9]*\)/\1\2\3/'` + ;; + *) echo "No match to get cxx_version_info for $CXX" ;; diff --git a/config/cmake/CTest.cmake b/config/cmake/CTest.cmake new file mode 100644 index 0000000..518f61e --- /dev/null +++ b/config/cmake/CTest.cmake @@ -0,0 +1,289 @@ +# - Configure a project for testing with CTest/CDash +# Include this module in the top CMakeLists.txt file of a project to +# enable testing with CTest and dashboard submissions to CDash: +# project(MyProject) +# ... +# include(CTest) +# The module automatically creates a BUILD_TESTING option that selects +# whether to enable testing support (ON by default). After including +# the module, use code like +# if(BUILD_TESTING) +# # ... CMake code to create tests ... +# endif() +# to creating tests when testing is enabled. +# +# To enable submissions to a CDash server, create a CTestConfig.cmake +# file at the top of the project with content such as +# set(CTEST_PROJECT_NAME "MyProject") +# set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC") +# set(CTEST_DROP_METHOD "http") +# set(CTEST_DROP_SITE "my.cdash.org") +# set(CTEST_DROP_LOCATION "/submit.php?project=MyProject") +# set(CTEST_DROP_SITE_CDASH TRUE) +# (the CDash server can provide the file to a project administrator +# who configures 'MyProject'). +# Settings in the config file are shared by both this CTest module and +# the CTest command-line tool's dashboard script mode (ctest -S). +# +# While building a project for submission to CDash, CTest scans the +# build output for errors and warnings and reports them with +# surrounding context from the build log. This generic approach works +# for all build tools, but does not give details about the command +# invocation that produced a given problem. One may get more detailed +# reports by adding +# set(CTEST_USE_LAUNCHERS 1) +# to the CTestConfig.cmake file. When this option is enabled, the +# CTest module tells CMake's Makefile generators to invoke every +# command in the generated build system through a CTest launcher +# program. (Currently the CTEST_USE_LAUNCHERS option is ignored on +# non-Makefile generators.) During a manual build each launcher +# transparently runs the command it wraps. During a CTest-driven +# build for submission to CDash each launcher reports detailed +# information when its command fails or warns. +# (Setting CTEST_USE_LAUNCHERS in CTestConfig.cmake is convenient, but +# also adds the launcher overhead even for manual builds. One may +# instead set it in a CTest dashboard script and add it to the CMake +# cache for the build tree.) + +#============================================================================= +# Copyright 2005-2009 Kitware, Inc. +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +OPTION(BUILD_TESTING "Build the testing tree." ON) + +# function to turn generator name into a version string +# like vs7 vs71 vs8 vs9 +FUNCTION(GET_VS_VERSION_STRING generator var) + STRING(REGEX REPLACE "Visual Studio ([0-9][0-9]?)($|.*)" "\\1" NUMBER "${generator}") + IF("${generator}" MATCHES "Visual Studio 7 .NET 2003") + SET(ver_string "vs71") + ELSE("${generator}" MATCHES "Visual Studio 7 .NET 2003") + SET(ver_string "vs${NUMBER}") + ENDIF("${generator}" MATCHES "Visual Studio 7 .NET 2003") + SET(${var} ${ver_string} PARENT_SCOPE) +ENDFUNCTION(GET_VS_VERSION_STRING) + +IF(BUILD_TESTING) + # Setup some auxilary macros + MACRO(SET_IF_NOT_SET var val) + IF(NOT DEFINED "${var}") + SET("${var}" "${val}") + ENDIF(NOT DEFINED "${var}") + ENDMACRO(SET_IF_NOT_SET) + + MACRO(SET_IF_SET var val) + IF(NOT "${val}" MATCHES "^$") + SET("${var}" "${val}") + ENDIF(NOT "${val}" MATCHES "^$") + ENDMACRO(SET_IF_SET) + + MACRO(SET_IF_SET_AND_NOT_SET var val) + IF(NOT "${val}" MATCHES "^$") + SET_IF_NOT_SET("${var}" "${val}") + ENDIF(NOT "${val}" MATCHES "^$") + ENDMACRO(SET_IF_SET_AND_NOT_SET) + + # Make sure testing is enabled + ENABLE_TESTING() + + IF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + INCLUDE("${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + SET_IF_SET_AND_NOT_SET(NIGHTLY_START_TIME "${CTEST_NIGHTLY_START_TIME}") + SET_IF_SET_AND_NOT_SET(DROP_METHOD "${CTEST_DROP_METHOD}") + SET_IF_SET_AND_NOT_SET(DROP_SITE "${CTEST_DROP_SITE}") + SET_IF_SET_AND_NOT_SET(DROP_SITE_USER "${CTEST_DROP_SITE_USER}") + SET_IF_SET_AND_NOT_SET(DROP_SITE_PASSWORD "${CTEST_DROP_SITE_PASWORD}") + SET_IF_SET_AND_NOT_SET(DROP_SITE_MODE "${CTEST_DROP_SITE_MODE}") + SET_IF_SET_AND_NOT_SET(DROP_LOCATION "${CTEST_DROP_LOCATION}") + SET_IF_SET_AND_NOT_SET(TRIGGER_SITE "${CTEST_TRIGGER_SITE}") + SET_IF_SET_AND_NOT_SET(UPDATE_TYPE "${CTEST_UPDATE_TYPE}") + ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/CTestConfig.cmake") + + # the project can have a DartConfig.cmake file + IF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") + INCLUDE("${PROJECT_SOURCE_DIR}/DartConfig.cmake") + ELSE(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") + # Dashboard is opened for submissions for a 24 hour period starting at + # the specified NIGHTLY_START_TIME. Time is specified in 24 hour format. + SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT") + SET_IF_NOT_SET(DROP_METHOD "http") + SET_IF_NOT_SET (COMPRESS_SUBMISSION ON) + ENDIF(EXISTS "${PROJECT_SOURCE_DIR}/DartConfig.cmake") + SET_IF_NOT_SET (NIGHTLY_START_TIME "00:00:00 EDT") + + FIND_PROGRAM(CVSCOMMAND cvs ) + SET(CVS_UPDATE_OPTIONS "-d -A -P" CACHE STRING + "Options passed to the cvs update command.") + FIND_PROGRAM(SVNCOMMAND svn) + FIND_PROGRAM(BZRCOMMAND bzr) + FIND_PROGRAM(HGCOMMAND hg) + FIND_PROGRAM(GITCOMMAND git) + + IF(NOT UPDATE_TYPE) + IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CVS") + SET(UPDATE_TYPE cvs) + ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn") + SET(UPDATE_TYPE svn) + ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr") + SET(UPDATE_TYPE bzr) + ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg") + SET(UPDATE_TYPE hg) + ELSEIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") + SET(UPDATE_TYPE git) + ENDIF() + ENDIF(NOT UPDATE_TYPE) + + STRING(TOLOWER "${UPDATE_TYPE}" _update_type) + IF("${_update_type}" STREQUAL "cvs") + SET(UPDATE_COMMAND "${CVSCOMMAND}") + SET(UPDATE_OPTIONS "${CVS_UPDATE_OPTIONS}") + ELSEIF("${_update_type}" STREQUAL "svn") + SET(UPDATE_COMMAND "${SVNCOMMAND}") + SET(UPDATE_OPTIONS "${SVN_UPDATE_OPTIONS}") + ELSEIF("${_update_type}" STREQUAL "bzr") + SET(UPDATE_COMMAND "${BZRCOMMAND}") + SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}") + ELSEIF("${_update_type}" STREQUAL "hg") + SET(UPDATE_COMMAND "${HGCOMMAND}") + SET(UPDATE_OPTIONS "${HG_UPDATE_OPTIONS}") + ELSEIF("${_update_type}" STREQUAL "git") + SET(UPDATE_COMMAND "${GITCOMMAND}") + SET(UPDATE_OPTIONS "${GIT_UPDATE_OPTIONS}") + ENDIF() + + SET(DART_TESTING_TIMEOUT 1500 CACHE STRING + "Maximum time allowed before CTest will kill the test.") + + SET(CTEST_SUBMIT_RETRY_DELAY 5 CACHE STRING + "How long to wait between timed-out CTest submissions.") + SET(CTEST_SUBMIT_RETRY_COUNT 3 CACHE STRING + "How many times to retry timed-out CTest submissions.") + + FIND_PROGRAM(MEMORYCHECK_COMMAND + NAMES purify valgrind boundscheck + PATHS + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Rational Software\\Purify\\Setup;InstallFolder]" + DOC "Path to the memory checking command, used for memory error detection." + ) + FIND_PROGRAM(SLURM_SBATCH_COMMAND sbatch DOC + "Path to the SLURM sbatch executable" + ) + FIND_PROGRAM(SLURM_SRUN_COMMAND srun DOC + "Path to the SLURM srun executable" + ) + SET(MEMORYCHECK_SUPPRESSIONS_FILE "" CACHE FILEPATH + "File that contains suppressions for the memory checker") + FIND_PROGRAM(SCPCOMMAND scp DOC + "Path to scp command, used by CTest for submitting results to a Dart server" + ) + FIND_PROGRAM(COVERAGE_COMMAND gcov DOC + "Path to the coverage program that CTest uses for performing coverage inspection" + ) + + # set the site name + SITE_NAME(SITE) + # set the build name + IF(NOT BUILDNAME) + SET(DART_COMPILER "${CMAKE_CXX_COMPILER}") + IF(NOT DART_COMPILER) + SET(DART_COMPILER "${CMAKE_C_COMPILER}") + ENDIF(NOT DART_COMPILER) + IF(NOT DART_COMPILER) + SET(DART_COMPILER "unknown") + ENDIF(NOT DART_COMPILER) + IF(WIN32) + SET(DART_NAME_COMPONENT "NAME_WE") + ELSE(WIN32) + SET(DART_NAME_COMPONENT "NAME") + ENDIF(WIN32) + IF(NOT BUILD_NAME_SYSTEM_NAME) + SET(BUILD_NAME_SYSTEM_NAME "${CMAKE_SYSTEM_NAME}") + ENDIF(NOT BUILD_NAME_SYSTEM_NAME) + IF(WIN32) + SET(BUILD_NAME_SYSTEM_NAME "Win32") + ENDIF(WIN32) + IF(UNIX OR BORLAND) + GET_FILENAME_COMPONENT(DART_CXX_NAME + "${CMAKE_CXX_COMPILER}" ${DART_NAME_COMPONENT}) + ELSE(UNIX OR BORLAND) + GET_FILENAME_COMPONENT(DART_CXX_NAME + "${CMAKE_BUILD_TOOL}" ${DART_NAME_COMPONENT}) + ENDIF(UNIX OR BORLAND) + IF(DART_CXX_NAME MATCHES "msdev") + SET(DART_CXX_NAME "vs60") + ENDIF(DART_CXX_NAME MATCHES "msdev") + IF(DART_CXX_NAME MATCHES "devenv") + GET_VS_VERSION_STRING("${CMAKE_GENERATOR}" DART_CXX_NAME) + ENDIF(DART_CXX_NAME MATCHES "devenv") + IF (SYSTEM_NAME_EXT) + SET (BUILD_NAME_SYSTEM_NAME "${BUILD_NAME_SYSTEM_NAME}_${SYSTEM_NAME_EXT}") + ENDIF (SYSTEM_NAME_EXT) + IF(BUILD_NAME_EXT) + SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}-${BUILD_NAME_EXT}") + ELSE(BUILD_NAME_EXT) + SET(BUILDNAME "${BUILD_NAME_SYSTEM_NAME}-${DART_CXX_NAME}") + ENDIF( BUILD_NAME_EXT) + ENDIF(NOT BUILDNAME) + + # the build command + BUILD_COMMAND(MAKECOMMAND_DEFAULT_VALUE + CONFIGURATION "\${CTEST_CONFIGURATION_TYPE}") + SET(MAKECOMMAND ${MAKECOMMAND_DEFAULT_VALUE} + CACHE STRING "Command to build the project") + + # the default build configuration the ctest build handler will use + # if there is no -C arg given to ctest: + SET(DEFAULT_CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}") + IF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "") + SET(DEFAULT_CTEST_CONFIGURATION_TYPE "Release") + ENDIF(DEFAULT_CTEST_CONFIGURATION_TYPE STREQUAL "") + + IF(NOT "${CMAKE_GENERATOR}" MATCHES "Make") + SET(CTEST_USE_LAUNCHERS 0) + ENDIF(NOT "${CMAKE_GENERATOR}" MATCHES "Make") + IF(CTEST_USE_LAUNCHERS) + SET(CTEST_LAUNCH_COMPILE "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <OBJECT> --source <SOURCE> --language <LANGUAGE> --") + SET(CTEST_LAUNCH_LINK "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <TARGET> --target-type <TARGET_TYPE> --language <LANGUAGE> --") + SET(CTEST_LAUNCH_CUSTOM "\"${CMAKE_CTEST_COMMAND}\" --launch --target-name <TARGET_NAME> --build-dir <CMAKE_CURRENT_BINARY_DIR> --output <OUTPUT> --") + SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CTEST_LAUNCH_COMPILE}") + SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK "${CTEST_LAUNCH_LINK}") + SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_CUSTOM "${CTEST_LAUNCH_CUSTOM}") + ENDIF(CTEST_USE_LAUNCHERS) + + MARK_AS_ADVANCED( + COVERAGE_COMMAND + CVSCOMMAND + SVNCOMMAND + BZRCOMMAND + HGCOMMAND + GITCOMMAND + CVS_UPDATE_OPTIONS + SVN_UPDATE_OPTIONS + BZR_UPDATE_OPTIONS + MAKECOMMAND + MEMORYCHECK_COMMAND + MEMORYCHECK_SUPPRESSIONS_FILE + PURIFYCOMMAND + SCPCOMMAND + SLURM_SBATCH_COMMAND + SLURM_SRUN_COMMAND + SITE + CTEST_SUBMIT_RETRY_DELAY + CTEST_SUBMIT_RETRY_COUNT + ) + # BUILDNAME + IF(NOT RUN_FROM_DART) + SET(RUN_FROM_CTEST_OR_DART 1) + INCLUDE(CTestTargets) + SET(RUN_FROM_CTEST_OR_DART) + ENDIF(NOT RUN_FROM_DART) +ENDIF(BUILD_TESTING) diff --git a/config/cmake/CTestCustom.cmake b/config/cmake/CTestCustom.cmake new file mode 100755 index 0000000..e949350 --- /dev/null +++ b/config/cmake/CTestCustom.cmake @@ -0,0 +1,516 @@ +SET (CTEST_CUSTOM_MAXIMUM_NUMBER_OF_WARNINGS 1500) + +SET (CTEST_CUSTOM_WARNING_EXCEPTION + ${CTEST_CUSTOM_WARNING_EXCEPTION} + "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning C4090" + "H5detect.c.[0-9]+.[ \t]*:[ \t]*warning:[ \t]*passing argument" + "H5detect.c[0-9 \t:]*warning:[ \t]*passing argument" + "H5Tconv.c[0-9 \t:]*warning:[ \t]*comparison is always false due to limited range of data type" + "testhdf5.h.[0-9]+.[ \t]*:[ \t]*warning C4005" + "H5Ztrans.c.[0-9]+.[ \t]*:[ \t]*warning C4244" + "SZIP.src.*:[ \t]*warning" + "POSIX name for this item is deprecated" + "disabling jobserver mode" +) + +SET (CTEST_CUSTOM_MEMCHECK_IGNORE + ${CTEST_CUSTOM_MEMCHECK_IGNORE} + flush1 #designed to fail + flush2 #designed to need flush1 + error_test #uses runTest.cmake + err_compat #uses runTest.cmake + links_env #uses runTest.cmake + h5test-clear-objects + h5perform-clear-objects + hl_test-clear-objects + hl_fortran_test-clear-objects + ######### tools/h5copy ######### + H5COPY-clearall-objects + H5COPY-H5LS_h5copytst-basic #uses runTest.cmake + H5COPY-clear-refs + H5COPY-region_ref #needs clear-refs + H5COPY-H5LS_h5copy_ref-refs #uses runTest.cmake + H5COPY-clear-ext-links + H5COPY-ext_link #needs clear-ext-links + H5COPY-ext_link_f #needs clear-ext-links + H5COPY-ext_dangle_noobj #needs clear-ext-links + H5COPY-ext_dangle_noobj_f #needs clear-ext-links + H5COPY-ext_dangle_nofile #needs clear-ext-links + H5COPY-ext_dangle_nofile_f #needs clear-ext-links + H5COPY-ext_link_group #needs clear-ext-links + H5COPY-ext_link_group_f #needs clear-ext-links + H5COPY-H5LS_h5copy_extlinks_src-links #uses runTest.cmake + H5COPY-clear-misc + H5COPY-CMP-h5copy_misc1 #uses runTest.cmake + ######### tools/h5diff ######### + H5DIFF-clearall-objects + H5DIFF-h5diff_10 #uses runTest.cmake + H5DIFF-h5diff_11 #uses runTest.cmake + H5DIFF-h5diff_12 #uses runTest.cmake + H5DIFF-h5diff_13 #uses runTest.cmake + H5DIFF-h5diff_14 #uses runTest.cmake + H5DIFF-h5diff_15 #uses runTest.cmake + H5DIFF-h5diff_16_1 #uses runTest.cmake + H5DIFF-h5diff_16_2 #uses runTest.cmake + H5DIFF-h5diff_16_3 #uses runTest.cmake + H5DIFF-h5diff_17 #uses runTest.cmake + H5DIFF-h5diff_171 #uses runTest.cmake + H5DIFF-h5diff_172 #uses runTest.cmake + H5DIFF-h5diff_18 #uses runTest.cmake + H5DIFF-h5diff_18_1 #uses runTest.cmake + H5DIFF-h5diff_20 #uses runTest.cmake + H5DIFF-h5diff_21 #uses runTest.cmake + H5DIFF-h5diff_22 #uses runTest.cmake + H5DIFF-h5diff_23 #uses runTest.cmake + H5DIFF-h5diff_24 #uses runTest.cmake + H5DIFF-h5diff_25 #uses runTest.cmake + H5DIFF-h5diff_26 #uses runTest.cmake + H5DIFF-h5diff_27 #uses runTest.cmake + H5DIFF-h5diff_28 #uses runTest.cmake + H5DIFF-h5diff_50 #uses runTest.cmake + H5DIFF-h5diff_51 #uses runTest.cmake + H5DIFF-h5diff_52 #uses runTest.cmake + H5DIFF-h5diff_53 #uses runTest.cmake + H5DIFF-h5diff_54 #uses runTest.cmake + H5DIFF-h5diff_55 #uses runTest.cmake + H5DIFF-h5diff_56 #uses runTest.cmake + H5DIFF-h5diff_57 #uses runTest.cmake + H5DIFF-h5diff_58 #uses runTest.cmake + H5DIFF-h5diff_600 #uses runTest.cmake + H5DIFF-h5diff_601 #uses runTest.cmake + H5DIFF-h5diff_603 #uses runTest.cmake + H5DIFF-h5diff_604 #uses runTest.cmake + H5DIFF-h5diff_605 #uses runTest.cmake + H5DIFF-h5diff_606 #uses runTest.cmake + H5DIFF-h5diff_607 #uses runTest.cmake + H5DIFF-h5diff_608 #uses runTest.cmake + H5DIFF-h5diff_609 #uses runTest.cmake + H5DIFF-h5diff_610 #uses runTest.cmake + H5DIFF-h5diff_612 #uses runTest.cmake + H5DIFF-h5diff_613 #uses runTest.cmake + H5DIFF-h5diff_614 #uses runTest.cmake + H5DIFF-h5diff_615 #uses runTest.cmake + H5DIFF-h5diff_616 #uses runTest.cmake + H5DIFF-h5diff_617 #uses runTest.cmake + H5DIFF-h5diff_618 #uses runTest.cmake + H5DIFF-h5diff_619 #uses runTest.cmake + H5DIFF-h5diff_621 #uses runTest.cmake + H5DIFF-h5diff_622 #uses runTest.cmake + H5DIFF-h5diff_623 #uses runTest.cmake + H5DIFF-h5diff_624 #uses runTest.cmake + H5DIFF-h5diff_625 #uses runTest.cmake + H5DIFF-h5diff_626 #uses runTest.cmake + H5DIFF-h5diff_627 #uses runTest.cmake + H5DIFF-h5diff_628 #uses runTest.cmake + H5DIFF-h5diff_70 #uses runTest.cmake + H5DIFF-h5diff_80 #uses runTest.cmake + H5DIFF-h5diff_90 #uses runTest.cmake + H5DIFF-h5diff_101 #uses runTest.cmake + H5DIFF-h5diff_102 #uses runTest.cmake + H5DIFF-h5diff_200 #uses runTest.cmake + H5DIFF-h5diff_201 #uses runTest.cmake + H5DIFF-h5diff_202 #uses runTest.cmake + H5DIFF-h5diff_203 #uses runTest.cmake + H5DIFF-h5diff_204 #uses runTest.cmake + H5DIFF-h5diff_205 #uses runTest.cmake + H5DIFF-h5diff_206 #uses runTest.cmake + H5DIFF-h5diff_207 #uses runTest.cmake + H5DIFF-h5diff_300 #uses runTest.cmake + H5DIFF-h5diff_400 #uses runTest.cmake + H5DIFF-h5diff_401 #uses runTest.cmake + H5DIFF-h5diff_402 #uses runTest.cmake + H5DIFF-h5diff_403 #uses runTest.cmake + H5DIFF-h5diff_404 #uses runTest.cmake + H5DIFF-h5diff_405 #uses runTest.cmake + H5DIFF-h5diff_406 #uses runTest.cmake + H5DIFF-h5diff_407 #uses runTest.cmake + H5DIFF-h5diff_408 #uses runTest.cmake + H5DIFF-h5diff_409 #uses runTest.cmake + H5DIFF-h5diff_410 #uses runTest.cmake + H5DIFF-h5diff_411 #uses runTest.cmake + H5DIFF-h5diff_412 #uses runTest.cmake + H5DIFF-h5diff_413 #uses runTest.cmake + H5DIFF-h5diff_414 #uses runTest.cmake + H5DIFF-h5diff_415 #uses runTest.cmake + H5DIFF-h5diff_416 #uses runTest.cmake + H5DIFF-h5diff_417 #uses runTest.cmake + H5DIFF-h5diff_418 #uses runTest.cmake + H5DIFF-h5diff_419 #uses runTest.cmake + H5DIFF-h5diff_420 #uses runTest.cmake + H5DIFF-h5diff_421 #uses runTest.cmake + H5DIFF-h5diff_422 #uses runTest.cmake + H5DIFF-h5diff_423 #uses runTest.cmake + H5DIFF-h5diff_424 #uses runTest.cmake + H5DIFF-h5diff_425 #uses runTest.cmake + H5DIFF-h5diff_450 #uses runTest.cmake + H5DIFF-h5diff_451 #uses runTest.cmake + H5DIFF-h5diff_452 #uses runTest.cmake + H5DIFF-h5diff_453 #uses runTest.cmake + H5DIFF-h5diff_454 #uses runTest.cmake + H5DIFF-h5diff_455 #uses runTest.cmake + H5DIFF-h5diff_456 #uses runTest.cmake + H5DIFF-h5diff_457 #uses runTest.cmake + H5DIFF-h5diff_458 #uses runTest.cmake + H5DIFF-h5diff_459 #uses runTest.cmake + H5DIFF-h5diff_500 #uses runTest.cmake + H5DIFF-h5diff_501 #uses runTest.cmake + H5DIFF-h5diff_502 #uses runTest.cmake + H5DIFF-h5diff_503 #uses runTest.cmake + H5DIFF-h5diff_504 #uses runTest.cmake + H5DIFF-h5diff_505 #uses runTest.cmake + H5DIFF-h5diff_506 #uses runTest.cmake + H5DIFF-h5diff_507 #uses runTest.cmake + H5DIFF-h5diff_508 #uses runTest.cmake + H5DIFF-h5diff_509 #uses runTest.cmake + H5DIFF-h5diff_510 #uses runTest.cmake + H5DIFF-h5diff_511 #uses runTest.cmake + H5DIFF-h5diff_512 #uses runTest.cmake + H5DIFF-h5diff_513 #uses runTest.cmake + H5DIFF-h5diff_514 #uses runTest.cmake + H5DIFF-h5diff_515 #uses runTest.cmake + H5DIFF-h5diff_516 #uses runTest.cmake + H5DIFF-h5diff_517 #uses runTest.cmake + H5DIFF-h5diff_518 #uses runTest.cmake + H5DIFF-h5diff_480 #uses runTest.cmake + H5DIFF-h5diff_481 #uses runTest.cmake + H5DIFF-h5diff_482 #uses runTest.cmake + H5DIFF-h5diff_483 #uses runTest.cmake + H5DIFF-h5diff_484 #uses runTest.cmake + H5DIFF-h5diff_530 #uses runTest.cmake + ######### tools/h5dump ######### + H5DUMP-clearall-objects + H5DUMP-packedbits #uses runTest.cmake + H5DUMP-tgroup-1 #uses runTest.cmake + H5DUMP-tgroup-2 #uses runTest.cmake + H5DUMP-tdset-1 #uses runTest.cmake + H5DUMP-tdset-2 #uses runTest.cmake + H5DUMP-tattr-1 #uses runTest.cmake + H5DUMP-tattr-2 #uses runTest.cmake + H5DUMP-tattr-3 #uses runTest.cmake + H5DUMP-tnamed_dtype_attr #uses runTest.cmake + H5DUMP-tslink-1 #uses runTest.cmake + H5DUMP-tudlink-1 #uses runTest.cmake + H5DUMP-tslink-2 #uses runTest.cmake + H5DUMP-tudlink-2 #uses runTest.cmake + H5DUMP-thlink-1 #uses runTest.cmake + H5DUMP-thlink-2 #uses runTest.cmake + H5DUMP-thlink-3 #uses runTest.cmake + H5DUMP-thlink-4 #uses runTest.cmake + H5DUMP-thlink-5 #uses runTest.cmake + H5DUMP-tcomp-1 #uses runTest.cmake + H5DUMP-tcomp-2 #uses runTest.cmake + H5DUMP-tcomp-4 #uses runTest.cmake + H5DUMP-tnestcomp-1 #uses runTest.cmake + H5DUMP-tall-1 #uses runTest.cmake + H5DUMP-tall-2 #uses runTest.cmake + H5DUMP-tall-3 #uses runTest.cmake + H5DUMP-tloop-1 #uses runTest.cmake + H5DUMP-tstr-1 #uses runTest.cmake + H5DUMP-tstr-2 #uses runTest.cmake + H5DUMP-tsaf #uses runTest.cmake + H5DUMP-tvldtypes1 #uses runTest.cmake + H5DUMP-tvldtypes2 #uses runTest.cmake + H5DUMP-tvldtypes3 #uses runTest.cmake + H5DUMP-tvldtypes4 #uses runTest.cmake + H5DUMP-tvldtypes5 #uses runTest.cmake + H5DUMP-tvlstr #uses runTest.cmake + H5DUMP-tarray1 #uses runTest.cmake + H5DUMP-tarray2 #uses runTest.cmake + H5DUMP-tarray3 #uses runTest.cmake + H5DUMP-tarray4 #uses runTest.cmake + H5DUMP-tarray5 #uses runTest.cmake + H5DUMP-tarray6 #uses runTest.cmake + H5DUMP-tarray7 #uses runTest.cmake + H5DUMP-tarray8 #uses runTest.cmake + H5DUMP-tempty #uses runTest.cmake + H5DUMP-tgrp_comments #uses runTest.cmake + H5DUMP-tsplit_file #uses runTest.cmake + H5DUMP-tfamily #uses runTest.cmake + H5DUMP-tmulti #uses runTest.cmake + H5DUMP-tlarge_objname #uses runTest.cmake + H5DUMP-tall-2A #uses runTest.cmake + H5DUMP-tall-2B #uses runTest.cmake + H5DUMP-tall-4s #uses runTest.cmake + H5DUMP-tall-5s #uses runTest.cmake + H5DUMP-tdset-3s #uses runTest.cmake + H5DUMP-tchar1 #uses runTest.cmake + H5DUMP-tchar1 #uses runTest.cmake + H5DUMP-tnofilename #uses runTest.cmake + H5DUMP-tboot1 #uses runTest.cmake + H5DUMP-tboot2 #uses runTest.cmake + H5DUMP-tperror #uses runTest.cmake + H5DUMP-tcontents #uses runTest.cmake + H5DUMP-tcompact #uses runTest.cmake + H5DUMP-tcontiguos #uses runTest.cmake + H5DUMP-tchunked #uses runTest.cmake + H5DUMP-texternal #uses runTest.cmake + H5DUMP-tfill #uses runTest.cmake + H5DUMP-treference #uses runTest.cmake + H5DUMP-tstringe #uses runTest.cmake + H5DUMP-tstring #uses runTest.cmake + H5DUMP-tstring2 #uses runTest.cmake + H5DUMP-tindicesyes #uses runTest.cmake + H5DUMP-tindicesno #uses runTest.cmake + H5DUMP-tindicessub1 #uses runTest.cmake + H5DUMP-tindicessub2 #uses runTest.cmake + H5DUMP-tindicessub3 #uses runTest.cmake + H5DUMP-tindicessub4 #uses runTest.cmake + H5DUMP-tszip #uses runTest.cmake + H5DUMP-tdeflate #uses runTest.cmake + H5DUMP-tshuffle #uses runTest.cmake + H5DUMP-tfletcher32 #uses runTest.cmake + H5DUMP-tnbit #uses runTest.cmake + H5DUMP-tscaleoffset #uses runTest.cmake + H5DUMP-tallfilters #uses runTest.cmake + H5DUMP-tuserfilter #uses runTest.cmake + H5DUMP-tlonglinks #uses runTest.cmake + H5DUMP-tbigdims #uses runTest.cmake + H5DUMP-thyperslab #uses runTest.cmake + H5DUMP-tnullspace #uses runTest.cmake + H5DUMP-tvms #uses runTest.cmake + H5DUMP-tbin1LE #uses runTest.cmake + H5DUMP-tbin1 #uses runTest.cmake + H5DUMP-clear-out1 + H5DUMP-h5import-out1 + H5DUMP-h5diff-out1 + H5DUMP-tbin2 #uses runTest.cmake + H5DUMP-tbin3 #uses runTest.cmake + H5DUMP-clear-out3 + H5DUMP-h5import-out3 + H5DUMP-h5diff-out3 + H5DUMP-clear-objects + H5DUMP-tbin4 #uses runTest.cmake + H5DUMP-tdatareg #uses runTest.cmake + H5DUMP-tdataregR #uses runTest.cmake + H5DUMP-tattrreg #uses runTest.cmake + H5DUMP-tattrregR #uses runTest.cmake + H5DUMP-output-tbinregR #uses runTest.cmake + H5DUMP-output-cmp-tbinregR #uses runTest.cmake + H5DUMP-tordergr1 #uses runTest.cmake + H5DUMP-tordergr2 #uses runTest.cmake + H5DUMP-tordergr3 #uses runTest.cmake + H5DUMP-tordergr4 #uses runTest.cmake + H5DUMP-tordergr5 #uses runTest.cmake + H5DUMP-torderattr1 #uses runTest.cmake + H5DUMP-torderattr2 #uses runTest.cmake + H5DUMP-torderattr3 #uses runTest.cmake + H5DUMP-torderattr4 #uses runTest.cmake + H5DUMP-tfpformat #uses runTest.cmake + H5DUMP-textlinksrc #uses runTest.cmake + H5DUMP-textlinkfar #uses runTest.cmake + H5DUMP-textlink #uses runTest.cmake + H5DUMP_PACKED_BITS-clearall-objects + H5DUMP-tpackedbits #uses runTest.cmake + H5DUMP-tpackedbits2 #uses runTest.cmake + H5DUMP-tnofilename-with-packed-bits #uses runTest.cmake + H5DUMP-tpbitsSigned #uses runTest.cmake + H5DUMP-tpbitsUnsigned #uses runTest.cmake + H5DUMP-tpbitsOverlapped #uses runTest.cmake + H5DUMP-tpbitsMax #uses runTest.cmake + H5DUMP-tpbitsCompound #uses runTest.cmake + H5DUMP-tpbitsArray #uses runTest.cmake + H5DUMP-tpbitsMaxExceeded #uses runTest.cmake + H5DUMP-tpbitsOffsetExceeded #uses runTest.cmake + H5DUMP-tpbitsOffsetNegative #uses runTest.cmake + H5DUMP-tpbitsLengthPositive #uses runTest.cmake + H5DUMP-tpbitsLengthExceeded #uses runTest.cmake + H5DUMP-tpbitsIncomplete #uses runTest.cmake + H5DUMP-XML-clearall-objects + H5DUMP-XML-tall.h5 #uses runTest.cmake + H5DUMP-XML-tattr.h5 #uses runTest.cmake + H5DUMP-XML-tbitfields.h5 #uses runTest.cmake + H5DUMP-XML-tcompound.h5 #uses runTest.cmake + H5DUMP-XML-tcompound2.h5 #uses runTest.cmake + H5DUMP-XML-tdatareg.h5 #uses runTest.cmake + H5DUMP-XML-tdset.h5 #uses runTest.cmake + H5DUMP-XML-tdset2.h5 #uses runTest.cmake + H5DUMP-XML-tenum.h5 #uses runTest.cmake + H5DUMP-XML-tgroup.h5 #uses runTest.cmake + H5DUMP-XML-thlink.h5 #uses runTest.cmake + H5DUMP-XML-tloop.h5 #uses runTest.cmake + H5DUMP-XML-tloop2.h5 #uses runTest.cmake + H5DUMP-XML-tmany.h5 #uses runTest.cmake + H5DUMP-XML-tnestedcomp.h5 #uses runTest.cmake + H5DUMP-XML-tcompound_complex.h5 #uses runTest.cmake + H5DUMP-XML-tobjref.h5 #uses runTest.cmake + H5DUMP-XML-topaque.h5 #uses runTest.cmake + H5DUMP-XML-tslink.h5 #uses runTest.cmake + H5DUMP-XML-tudlink.h5 #uses runTest.cmake + H5DUMP-XML-textlink.h5 #uses runTest.cmake + H5DUMP-XML-tstr.h5 #uses runTest.cmake + H5DUMP-XML-tstr2.h5 #uses runTest.cmake + H5DUMP-XML-tref.h5 #uses runTest.cmake + H5DUMP-XML-tname-amp.h5 #uses runTest.cmake + H5DUMP-XML-tname-apos.h5 #uses runTest.cmake + H5DUMP-XML-tname-gt.h5 #uses runTest.cmake + H5DUMP-XML-tname-lt.h5 #uses runTest.cmake + H5DUMP-XML-tname-quot.h5 #uses runTest.cmake + H5DUMP-XML-tname-sp.h5 #uses runTest.cmake + H5DUMP-XML-tstring.h5 #uses runTest.cmake + H5DUMP-XML-tstring-at.h5 #uses runTest.cmake + H5DUMP-XML-tref-escapes.h5 #uses runTest.cmake + H5DUMP-XML-tref-escapes-at.h5 #uses runTest.cmake + H5DUMP-XML-tnodata.h5 #uses runTest.cmake + H5DUMP-XML-tarray1.h5 #uses runTest.cmake + H5DUMP-XML-tarray2.h5 #uses runTest.cmake + H5DUMP-XML-tarray3.h5 #uses runTest.cmake + H5DUMP-XML-tarray6.h5 #uses runTest.cmake + H5DUMP-XML-tarray7.h5 #uses runTest.cmake + H5DUMP-XML-tvldtypes1.h5 #uses runTest.cmake + H5DUMP-XML-tvldtypes2.h5 #uses runTest.cmake + H5DUMP-XML-tvldtypes3.h5 #uses runTest.cmake + H5DUMP-XML-tvldtypes4.h5 #uses runTest.cmake + H5DUMP-XML-tvldtypes5.h5 #uses runTest.cmake + H5DUMP-XML-tvlstr.h5 #uses runTest.cmake + H5DUMP-XML-tsaf.h5 #uses runTest.cmake + H5DUMP-XML-tempty.h5 #uses runTest.cmake + H5DUMP-XML-tnamed_dtype_attr.h5 #uses runTest.cmake + H5DUMP-XML-tempty-dtd.h5 #uses runTest.cmake + H5DUMP-XML-tempty-dtd-2.h5 #uses runTest.cmake + H5DUMP-XML-tempty-nons.h5 #uses runTest.cmake + H5DUMP-XML-tempty-nons-2.h5 #uses runTest.cmake + H5DUMP-XML-tempty-ns.h5 #uses runTest.cmake + H5DUMP-XML-tempty-ns-2.h5 #uses runTest.cmake + H5DUMP-XML-tempty-nons-uri.h5 #uses runTest.cmake + H5DUMP-XML-tempty-dtd-uri.h5 #uses runTest.cmake + H5DUMP-XML-tall-2A.h5 #uses runTest.cmake + H5DUMP-XML-torderattr1.h5 #uses runTest.cmake + H5DUMP-XML-torderattr2.h5 #uses runTest.cmake + H5DUMP-XML-torderattr3.h5 #uses runTest.cmake + H5DUMP-XML-torderattr4.h5 #uses runTest.cmake + H5DUMP-XML-tfpformat.h5 #uses runTest.cmake + ######### tools/h5import ######### + H5IMPORT-clear-objects + ######### tools/h5ls ######### + H5LS-clearall-objects + H5LS-help-1 #uses runTest.cmake + H5LS-help-2 #uses runTest.cmake + H5LS-help-3 #uses runTest.cmake + H5LS-tall-1 #uses runTest.cmake + H5LS-tall-2 #uses runTest.cmake + H5LS-tgroup #uses runTest.cmake + H5LS-tgroup-3 #uses runTest.cmake + H5LS-tgroup-1 #uses runTest.cmake + H5LS-tgroup-2 #uses runTest.cmake + H5LS-tdset-1 #uses runTest.cmake + H5LS-tslink-1 #uses runTest.cmake + H5LS-tsoftlinks-1 #uses runTest.cmake + H5LS-tsoftlinks-2 #uses runTest.cmake + H5LS-tsoftlinks-3 #uses runTest.cmake + H5LS-tsoftlinks-4 #uses runTest.cmake + H5LS-tsoftlinks-5 #uses runTest.cmake + H5LS-textlink-1 #uses runTest.cmake + H5LS-textlinksrc-1 #uses runTest.cmake + H5LS-textlinksrc-2 #uses runTest.cmake + H5LS-textlinksrc-3 #uses runTest.cmake + H5LS-textlinksrc-4 #uses runTest.cmake + H5LS-textlinksrc-5 #uses runTest.cmake + H5LS-textlinksrc-6 #uses runTest.cmake + H5LS-textlinksrc-7 #uses runTest.cmake + H5LS-tudlink-1 #uses runTest.cmake + H5LS-textlinksrc-1-old #uses runTest.cmake + H5LS-textlinksrc-2-old #uses runTest.cmake + H5LS-textlinksrc-3-old #uses runTest.cmake + H5LS-textlinksrc-6-old #uses runTest.cmake + H5LS-textlinksrc-7-old #uses runTest.cmake + H5LS-textlinksrc-nodangle-1 #uses runTest.cmake + H5LS-textlinksrc-nodangle-2 #uses runTest.cmake + H5LS-tsoftlinks-nodangle-1 #uses runTest.cmake + H5LS-thlinks-nodangle-1 #uses runTest.cmake + H5LS-thlink-1 #uses runTest.cmake + H5LS-tcomp-1 #uses runTest.cmake + H5LS-tnestcomp-1 #uses runTest.cmake + H5LS-tnestcomp-2 #uses runTest.cmake + H5LS-tnestcomp-3 #uses runTest.cmake + H5LS-tnestcomp-4 #uses runTest.cmake + H5LS-tloop-1 #uses runTest.cmake + H5LS-tstr-1 #uses runTest.cmake + H5LS-tsaf #uses runTest.cmake + H5LS-tvldtypes1 #uses runTest.cmake + H5LS-tarray1 #uses runTest.cmake + H5LS-tempty #uses runTest.cmake + H5LS-tattr2 #uses runTest.cmake + H5LS-nosuchfile #uses runTest.cmake + H5LS-tvldtypes2le #uses runTest.cmake + H5LS-tdataregle #uses runTest.cmake + ######### tools/h5repack ######### + H5REPACK-clearall-objects + H5REPACK-gzip_verbose_filters #uses runTest.cmake + H5REPACK_VERIFY_LAYOUT-dset2_chunk_20x10 #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT_ALL-chunk_20x10 #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset2_conti #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT_ALL-conti #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset2_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT_ALL-compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_compa_conti #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_compa_chunk #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_compa_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_conti_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_conti_chunk #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-dset_conti_conti #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-chunk_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-chunk_conti #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-chunk_18x13 #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-contig_small_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT-contig_small_fixed_compa #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT_ALL-layout_long_switches #uses grepTest.cmake + H5REPACK_VERIFY_LAYOUT_ALL-layout_short_switches #uses grepTest.cmake + ######### tools/h5stat ######### + H5STAT-clearall-objects + H5STAT-h5stat_help1 #uses runTest.cmake + H5STAT-h5stat_help2 #uses runTest.cmake + H5STAT-h5stat_filters #uses runTest.cmake + H5STAT-h5stat_filters-file #uses runTest.cmake + H5STAT-h5stat_filters-F #uses runTest.cmake + H5STAT-h5stat_filters-d #uses runTest.cmake + H5STAT-h5stat_filters-g #uses runTest.cmake + H5STAT-h5stat_filters-dT #uses runTest.cmake + H5STAT-h5stat_filters-UD #uses runTest.cmake + H5STAT-h5stat_filters-UT #uses runTest.cmake + H5STAT-h5stat_tsohm #uses runTest.cmake + H5STAT-h5stat_newgrat #uses runTest.cmake + H5STAT-h5stat_newgrat-UG #uses runTest.cmake + H5STAT-h5stat_newgrat-UA #uses runTest.cmake + ######### tools/misc ######### + h5repart_20K-clear-objects + h5repart_5K-clear-objects + h5repart_sec2-clear-objects + H5MKGRP-h5mkgrp_help #uses runTest.cmake + H5MKGRP-h5mkgrp_version #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_single + H5MKGRP-h5mkgrp_single #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_single #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_single-v + H5MKGRP-h5mkgrp_single-v #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_single-v #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_single-p + H5MKGRP-h5mkgrp_single-p #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_single-p #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_single_latest-l + H5MKGRP-h5mkgrp_single_latest-l #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_single_latest-l #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_several + H5MKGRP-h5mkgrp_several #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_several #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_several-v + H5MKGRP-h5mkgrp_several-v #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_several-v #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_several-p + H5MKGRP-h5mkgrp_several-p #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_several-p #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_several_latest-l + H5MKGRP-h5mkgrp_several_latest-l #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_several_latest-l #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_nested-p + H5MKGRP-h5mkgrp_nested-p #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_nested-p #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_nested_latest-lp + H5MKGRP-h5mkgrp_nested_latest-lp #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_nested_latest-lp #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_nested_mult-p + H5MKGRP-h5mkgrp_nested_mult-p #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_nested_mult-p #uses runTest.cmake + H5MKGRP-clear-h5mkgrp_nested_mult_latest-lp + H5MKGRP-h5mkgrp_nested_mult_latest-lp #uses runTest.cmake + H5MKGRP-H5LS-h5mkgrp_nested_mult_latest-lp #uses runTest.cmake +) diff --git a/config/cmake/CTestCustom.ctest b/config/cmake/CTestCustom.ctest deleted file mode 100755 index acb1918..0000000 --- a/config/cmake/CTestCustom.ctest +++ /dev/null @@ -1,19 +0,0 @@ -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:" - "POSIX name for this item is deprecated" - "disabling jobserver mode" -) - -SET (CTEST_CUSTOM_MEMCHECK_IGNORE - ${CTEST_CUSTOM_MEMCHECK_IGNORE} - H5DUMP - H5DIFF - H5REPACK - H5STAT - H5COPY - H5LS -) diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index b78d2c0..cea7bf9 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -161,8 +161,6 @@ ELSE (WINDOWS) SET (H5_DEFAULT_VFD H5FD_SEC2) ENDIF (WINDOWS) -#----------------------------------------------------------------------------- -# Check for some functions that are used IF (WINDOWS) SET (H5_HAVE_IO_H 1) SET (H5_HAVE_SETJMP_H 1) @@ -204,17 +202,16 @@ ENDIF (CYGWIN) # Check for the math library "m" #----------------------------------------------------------------------------- IF (NOT WINDOWS) - CHECK_LIBRARY_EXISTS_CONCAT ("m" printf H5_HAVE_LIBM) + CHECK_LIBRARY_EXISTS_CONCAT ("m" random H5_HAVE_LIBM) ENDIF (NOT WINDOWS) -CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" printf H5_HAVE_LIBWS2_32) -CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" printf H5_HAVE_LIBWSOCK32) +CHECK_LIBRARY_EXISTS_CONCAT ("ws2_32" WSAStartup H5_HAVE_LIBWS2_32) +CHECK_LIBRARY_EXISTS_CONCAT ("wsock32" gethostbyname H5_HAVE_LIBWSOCK32) #CHECK_LIBRARY_EXISTS_CONCAT ("dl" dlopen H5_HAVE_LIBDL) CHECK_LIBRARY_EXISTS_CONCAT ("ucb" gethostname H5_HAVE_LIBUCB) CHECK_LIBRARY_EXISTS_CONCAT ("socket" connect H5_HAVE_LIBSOCKET) CHECK_LIBRARY_EXISTS ("c" gethostbyname "" NOT_NEED_LIBNSL) - IF (NOT NOT_NEED_LIBNSL) CHECK_LIBRARY_EXISTS_CONCAT ("nsl" gethostbyname H5_HAVE_LIBNSL) ENDIF (NOT NOT_NEED_LIBNSL) @@ -285,22 +282,21 @@ ENDIF (H5_HAVE_STDINT_H AND CMAKE_CXX_COMPILER_LOADED) # Check for large file support #----------------------------------------------------------------------------- +# The linux-lfs option is deprecated. SET (LINUX_LFS 0) + SET (HDF5_EXTRA_FLAGS) IF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") # Linux Specific flags - ADD_DEFINITIONS (-D_POSIX_SOURCE -D_BSD_SOURCE) + SET (HDF5_EXTRA_FLAGS -D_POSIX_SOURCE -D_BSD_SOURCE) OPTION (HDF5_ENABLE_LARGE_FILE "Enable support for large (64-bit) files on Linux." ON) IF (HDF5_ENABLE_LARGE_FILE) SET (LARGEFILE 1) - SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) - SET (CMAKE_REQUIRED_DEFINITIONS ${HDF5_EXTRA_FLAGS}) + SET (HDF5_EXTRA_FLAGS ${HDF5_EXTRA_FLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) ENDIF (HDF5_ENABLE_LARGE_FILE) + SET (CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} ${HDF5_EXTRA_FLAGS}) ENDIF (CMAKE_SYSTEM MATCHES "Linux-([3-9]\\.[0-9]|2\\.[4-9])\\.") -IF (LINUX_LFS) - SET (HDF5_EXTRA_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE) - SET (CMAKE_REQUIRED_DEFINITIONS ${HDF5_EXTRA_FLAGS}) -ENDIF (LINUX_LFS) + ADD_DEFINITIONS (${HDF5_EXTRA_FLAGS}) #----------------------------------------------------------------------------- @@ -422,6 +418,15 @@ CHECK_FUNCTION_EXISTS (fstat64 H5_HAVE_FSTAT64) CHECK_FUNCTION_EXISTS (stat64 H5_HAVE_STAT64) #----------------------------------------------------------------------------- +# sigsetjmp is special; may actually be a macro +IF (NOT H5_HAVE_SIGSETJMP) + IF (H5_HAVE_SETJMP_H) + CHECK_SYMBOL_EXISTS (sigsetjmp "setjmp.h" H5_HAVE_MACRO_SIGSETJMP) + IF (H5_HAVE_MACRO_SIGSETJMP) + SET (H5_HAVE_SIGSETJMP 1) + ENDIF (H5_HAVE_MACRO_SIGSETJMP) + ENDIF (H5_HAVE_SETJMP_H) +ENDIF (NOT H5_HAVE_SIGSETJMP) #----------------------------------------------------------------------------- # Since gettimeofday is not defined any where standard, lets look in all the @@ -437,6 +442,7 @@ IF (NOT MSVC) ) IF (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE") SET (H5_HAVE_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_TIME_GETTIMEOFDAY") + SET (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY") ENDIF (HAVE_TIME_GETTIMEOFDAY STREQUAL "TRUE") ENDIF ("H5_HAVE_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_TIME_GETTIMEOFDAY$") @@ -449,19 +455,19 @@ IF (NOT MSVC) ) IF (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE") SET (H5_HAVE_SYS_TIME_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_SYS_TIME_GETTIMEOFDAY") + SET (H5_HAVE_GETTIMEOFDAY "1" CACHE INTERNAL "H5_HAVE_GETTIMEOFDAY") ENDIF (HAVE_SYS_TIME_GETTIMEOFDAY STREQUAL "TRUE") ENDIF ("H5_HAVE_SYS_TIME_GETTIMEOFDAY" MATCHES "^H5_HAVE_SYS_TIME_GETTIMEOFDAY$") -ENDIF (NOT MSVC) - -IF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY AND NOT MSVC) - MESSAGE (STATUS "---------------------------------------------------------------") - MESSAGE (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its") - MESSAGE (STATUS " own implementation.. This can happen on older versions of") - MESSAGE (STATUS " MinGW on Windows. Consider upgrading your MinGW installation") - MESSAGE (STATUS " to a newer version such as MinGW 3.12") - MESSAGE (STATUS "---------------------------------------------------------------") -ENDIF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY AND NOT MSVC) + IF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY) + MESSAGE (STATUS "---------------------------------------------------------------") + MESSAGE (STATUS "Function 'gettimeofday()' was not found. HDF5 will use its") + MESSAGE (STATUS " own implementation.. This can happen on older versions of") + MESSAGE (STATUS " MinGW on Windows. Consider upgrading your MinGW installation") + MESSAGE (STATUS " to a newer version such as MinGW 3.12") + MESSAGE (STATUS "---------------------------------------------------------------") + ENDIF (NOT HAVE_SYS_TIME_GETTIMEOFDAY AND NOT H5_HAVE_GETTIMEOFDAY) +ENDIF (NOT MSVC) # Check for Symbols CHECK_SYMBOL_EXISTS (tzname "time.h" H5_HAVE_DECL_TZNAME) @@ -509,11 +515,11 @@ MACRO (HDF5_FUNCTION_TEST OTHER_TEST) ENDIF ("${def}") ENDFOREACH (def) - IF (LINUX_LFS) + IF (LARGEFILE) SET (MACRO_CHECK_FUNCTION_DEFINITIONS "${MACRO_CHECK_FUNCTION_DEFINITIONS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE" ) - ENDIF (LINUX_LFS) + ENDIF (LARGEFILE) # (STATUS "Performing ${OTHER_TEST}") TRY_COMPILE (${OTHER_TEST} @@ -617,41 +623,41 @@ 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 (PRINT_LL_FOUND 0) - MESSAGE (STATUS "Checking for appropriate format for 64 bit long:") - FOREACH (HDF5_PRINTF_LL l64 l L q I64 ll) - SET (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}") - IF (H5_SIZEOF_LONG_LONG) - SET (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG") - ENDIF (H5_SIZEOF_LONG_LONG) - TRY_RUN (HDF5_PRINTF_LL_TEST_RUN HDF5_PRINTF_LL_TEST_COMPILE - ${HDF5_BINARY_DIR}/CMake - ${HDF5_RESOURCES_DIR}/HDF5Tests.c - CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS} - OUTPUT_VARIABLE OUTPUT - ) - IF (HDF5_PRINTF_LL_TEST_COMPILE) - IF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) - SET (H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll") - SET (PRINT_LL_FOUND 1) - ELSE (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) - MESSAGE ("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}") - ENDIF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) - ELSE (HDF5_PRINTF_LL_TEST_COMPILE) - FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log - "Test H5_PRINTF_LL_WIDTH for ${HDF5_PRINTF_LL} failed with the following output:\n ${OUTPUT}\n" - ) - ENDIF (HDF5_PRINTF_LL_TEST_COMPILE) - ENDFOREACH (HDF5_PRINTF_LL) - - IF (PRINT_LL_FOUND) - MESSAGE (STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}") - ELSE (PRINT_LL_FOUND) - MESSAGE (STATUS "Checking for apropriate format for 64 bit long: not found") - SET (H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL - "Width for printf for type `long long' or `__int64', us. `ll" + 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) + SET (CURRENT_TEST_DEFINITIONS "-DPRINTF_LL_WIDTH=${HDF5_PRINTF_LL}") + IF (H5_SIZEOF_LONG_LONG) + SET (CURRENT_TEST_DEFINITIONS "${CURRENT_TEST_DEFINITIONS} -DHAVE_LONG_LONG") + ENDIF (H5_SIZEOF_LONG_LONG) + TRY_RUN (HDF5_PRINTF_LL_TEST_RUN HDF5_PRINTF_LL_TEST_COMPILE + ${HDF5_BINARY_DIR}/CMake + ${HDF5_RESOURCES_DIR}/HDF5Tests.c + CMAKE_FLAGS -DCOMPILE_DEFINITIONS:STRING=${CURRENT_TEST_DEFINITIONS} + OUTPUT_VARIABLE OUTPUT + ) + IF (HDF5_PRINTF_LL_TEST_COMPILE) + IF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) + SET (H5_PRINTF_LL_WIDTH "\"${HDF5_PRINTF_LL}\"" CACHE INTERNAL "Width for printf for type `long long' or `__int64', us. `ll") + SET (PRINT_LL_FOUND 1) + ELSE (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) + MESSAGE ("Width with ${HDF5_PRINTF_LL} failed with result: ${HDF5_PRINTF_LL_TEST_RUN}") + ENDIF (HDF5_PRINTF_LL_TEST_RUN MATCHES 0) + ELSE (HDF5_PRINTF_LL_TEST_COMPILE) + FILE (APPEND ${CMAKE_BINARY_DIR}/CMakeFiles/CMakeError.log + "Test H5_PRINTF_LL_WIDTH for ${HDF5_PRINTF_LL} failed with the following output:\n ${OUTPUT}\n" ) - ENDIF (PRINT_LL_FOUND) + ENDIF (HDF5_PRINTF_LL_TEST_COMPILE) + ENDFOREACH (HDF5_PRINTF_LL) + + IF (PRINT_LL_FOUND) + MESSAGE (STATUS "Checking for apropriate format for 64 bit long: found ${H5_PRINTF_LL_WIDTH}") + ELSE (PRINT_LL_FOUND) + MESSAGE (STATUS "Checking for apropriate format for 64 bit long: not found") + SET (H5_PRINTF_LL_WIDTH "\"unknown\"" CACHE INTERNAL + "Width for printf for type `long long' or `__int64', us. `ll" + ) + ENDIF (PRINT_LL_FOUND) ENDIF (NOT H5_PRINTF_LL_WIDTH OR H5_PRINTF_LL_WIDTH MATCHES "unknown") # ---------------------------------------------------------------------- @@ -684,7 +690,7 @@ MACRO (H5ConversionTests TEST msg) IF (${TEST}_COMPILE) IF (${TEST}_RUN MATCHES 0) SET (${TEST} 1 CACHE INTERNAL ${msg}) - MESSAGE(STATUS "${msg}... yes") + MESSAGE (STATUS "${msg}... yes") ELSE (${TEST}_RUN MATCHES 0) SET (${TEST} "" CACHE INTERNAL ${msg}) MESSAGE (STATUS "${msg}... no") diff --git a/config/cmake/FindHDF5.cmake b/config/cmake/FindHDF5.cmake index 4e448ca..a705d5b 100644 --- a/config/cmake/FindHDF5.cmake +++ b/config/cmake/FindHDF5.cmake @@ -15,11 +15,12 @@ # HDF5_VERSION_MINOR - minor part (e.g. 5)
#
# The following boolean vars will be defined
-# HDF5_ENABLE_PARALLEL - 1 if HDF5 parallel supported
-# HDF5_BUILD_FORTRAN - 1 if HDF5 was compiled with fortran on
-# HDF5_BUILD_CPP_LIB - 1 if HDF5 was compiled with cpp on
-# HDF5_BUILD_TOOLS - 1 if HDF5 was compiled with tools on
-# HDF5_BUILD_HL_LIB - 1 if HDF5 was compiled with parallel on
+# HDF5_ENABLE_PARALLEL - 1 if HDF5 parallel supported
+# HDF5_BUILD_FORTRAN - 1 if HDF5 was compiled with fortran on
+# HDF5_BUILD_CPP_LIB - 1 if HDF5 was compiled with cpp on
+# HDF5_BUILD_TOOLS - 1 if HDF5 was compiled with tools on
+# HDF5_BUILD_HL_LIB - 1 if HDF5 was compiled with high level on
+# HDF5_BUILD_HL_CPP_LIB - 1 if HDF5 was compiled with high level and cpp on
#
# Target names that are valid (depending on enabled options)
# will be the following
@@ -35,22 +36,50 @@ # hdf5_hl_cpp : High Level cpp interface library
#
# To aid in finding HDF5 as part of a subproject set
-# HDF5_ROOT_DIR_HINT to the location where HDF5-config.cmake lies
+# HDF5_ROOT_DIR_HINT to the location where hdf5-config.cmake lies
-FIND_PATH (HDF5_ROOT_DIR "HDF5-config.cmake"
- ${HDF5_ROOT_DIR_HINT}
- /usr/local/lib
- /usr/local/lib64
- /usr/lib
- /usr/lib64
- "C:/Program Files/HDF5/lib"
+INCLUDE (SelectLibraryConfigurations)
+INCLUDE (FindPackageHandleStandardArgs)
+
+# The HINTS option should only be used for values computed from the system.
+SET (_HDF5_HINTS
+ $ENV{HOME}/.local
+ $ENV{HDF5_ROOT}
+ $ENV{HDF5_ROOT_DIR_HINT}
+)
+# Hard-coded guesses should still go in PATHS. This ensures that the user
+# environment can always override hard guesses.
+SET (_HDF5_PATHS
+ $ENV{HOME}/.local
+ $ENV{HDF5_ROOT}
+ $ENV{HDF5_ROOT_DIR_HINT}
+ /usr/lib/hdf5
+ /usr/share/hdf5
+ /usr/local/hdf5
+ /usr/local/hdf5/share
)
-FIND_PATH (HDF5_INCLUDE_DIR "H5public.h"
- ${HDF5_ROOT_DIR}/../include
+FIND_PATH (HDF5_ROOT_DIR "hdf5-config.cmake"
+ HINTS ${_HDF5_HINTS}
+ PATHS ${_HDF5_PATHS}
+ PATH_SUFFIXES
+ lib/cmake/hdf5-1.9
+ share/cmake/hdf5-1.9
)
+FIND_PATH (HDF5_INCLUDE_DIRS "H5public.h"
+ HINTS ${_HDF5_HINTS}
+ PATHS ${_HDF5_PATHS}
+ PATH_SUFFIXES
+ include
+ Include
+)
+
+# For backwards compatibility we set HDF5_INCLUDE_DIR to the value of
+# HDF5_INCLUDE_DIRS
+SET ( HDF5_INCLUDE_DIR "${HDF5_INCLUDE_DIRS}" )
+
IF (HDF5_INCLUDE_DIR)
SET (HDF5_FOUND "YES")
- INCLUDE (${HDF5_ROOT_DIR}/HDF5-config.cmake)
+ INCLUDE (${HDF5_ROOT_DIR}/hdf5-config.cmake)
ENDIF (HDF5_INCLUDE_DIR)
diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 0c2b084..0dbd1ec 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -16,12 +16,21 @@ /* Defined if HDF5 was built with CMake AND build as a shared library */ #cmakedefine H5_BUILT_AS_DYNAMIC_LIB @H5_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 was built with CMake AND build as a static library */ +#cmakedefine H5_BUILT_AS_STATIC_LIB @H5_BUILT_AS_STATIC_LIB@ + /* Defined if HDF5 CPP was built with CMake AND build as a shared library */ #cmakedefine H5_CPP_BUILT_AS_DYNAMIC_LIB @H5_CPP_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 CPP was built with CMake AND build as a static library */ +#cmakedefine H5_CPP_BUILT_AS_STATIC_LIB @H5_CPP_BUILT_AS_STATIC_LIB@ + /* Defined if HDF5 HL was built with CMake AND build as a shared library */ #cmakedefine H5_HL_BUILT_AS_DYNAMIC_LIB @H5_HL_BUILT_AS_DYNAMIC_LIB@ +/* Defined if HDF5 HL was built with CMake AND build as a static library */ +#cmakedefine H5_HL_BUILT_AS_STATIC_LIB @H5_HL_BUILT_AS_STATIC_LIB@ + /* Define if building universal (internal helper macro) */ #cmakedefine H5_AC_APPLE_UNIVERSAL_BUILD @H5_AC_APPLE_UNIVERSAL_BUILD@ @@ -188,7 +197,7 @@ /* Define to 1 if you have the `gettimeofday' function declared in time.h . */ #cmakedefine H5_HAVE_TIME_GETTIMEOFDAY @H5_HAVE_TIME_GETTIMEOFDAY@ -/* Define to 1 if you have the `gettimeofday' function declared in time.h . */ +/* Define to 1 if you have the `gettimeofday' function declared in sys/time.h . */ #cmakedefine H5_HAVE_SYS_TIME_GETTIMEOFDAY @H5_HAVE_SYS_TIME_GETTIMEOFDAY@ /* Define to 1 if you have the `get_fpc_csr' function. */ @@ -291,6 +300,9 @@ /* Define to 1 if you have the `rand_r' function. */ #cmakedefine H5_HAVE_RAND_R @H5_HAVE_RAND_R@ +/* Define to 1 if you have the `sigsetjmp' function. */ +#cmakedefine H5_HAVE_SETJMP @H5_HAVE_SETJMP@ + /* Define to 1 if you have the <setjmp.h> header file. */ #cmakedefine H5_HAVE_SETJMP_H @H5_HAVE_SETJMP_H@ @@ -306,6 +318,12 @@ /* Define to 1 if you have the `signal' function. */ #cmakedefine H5_HAVE_SIGNAL @H5_HAVE_SIGNAL@ +/* Define to 1 if you have the `sigprocmask' function. */ +#cmakedefine H5_HAVE_SIGPROCMASK @H5_HAVE_SIGPROCMASK@ + +/* Define to 1 if you have the `sigsetjmp' function. */ +#cmakedefine H5_HAVE_SIGSETJMP @H5_HAVE_SIGSETJMP@ + /* Define to 1 if you have the `snprintf' function. */ #cmakedefine H5_HAVE_SNPRINTF @H5_HAVE_SNPRINTF@ @@ -345,7 +363,7 @@ /* Define if `struct timezone' is defined */ #cmakedefine H5_HAVE_STRUCT_TIMEZONE @H5_HAVE_STRUCT_TIMEZONE@ -/* Define to 1 if `struct tm' is a member of `tm_zone'. */ +/* Define to 1 if `tm_zone' is a member of `struct tm'. */ #cmakedefine H5_HAVE_STRUCT_TM_TM_ZONE @H5_HAVE_STRUCT_TM_TM_ZONE@ /* Define if `struct videoconfig' is defined */ @@ -470,6 +488,10 @@ values correctly. */ #cmakedefine H5_LDOUBLE_TO_LLONG_ACCURATE @H5_LDOUBLE_TO_LLONG_ACCURATE@ +/* Define if your system converts long double to (unsigned) long values with + special algorithm. */ +#cmakedefine H5_LDOUBLE_TO_LONG_SPECIAL @H5_LDOUBLE_TO_LONG_SPECIAL@ + /* Define if your system can convert long double to unsigned int values correctly. */ #cmakedefine H5_LDOUBLE_TO_UINT_ACCURATE @H5_LDOUBLE_TO_UINT_ACCURATE@ @@ -481,6 +503,10 @@ values correctly. */ #cmakedefine H5_LLONG_TO_LDOUBLE_CORRECT @H5_LLONG_TO_LDOUBLE_CORRECT@ +/* Define if your system can convert (unsigned) long to long double values + with special algorithm. */ +#cmakedefine H5_LONG_TO_LDOUBLE_SPECIAL @H5_LONG_TO_LDOUBLE_SPECIAL@ + /* Define to the sub-directory in which libtool stores uninstalled libraries. */ #cmakedefine H5_LT_OBJDIR @H5_LT_OBJDIR@ @@ -620,6 +646,9 @@ /* The size of `off_t', as computed by sizeof. */ #define H5_SIZEOF_OFF_T @H5_SIZEOF_OFF_T@ +/* The size of `ptrdiff_t', as computed by sizeof. */ +/* #define H5_SIZEOF_PTRDIFF_T @H5_SIZEOF_PTRDIFF_T@ */ + /* The size of `short', as computed by sizeof. */ #define H5_SIZEOF_SHORT @H5_SIZEOF_SHORT@ @@ -730,6 +759,12 @@ # endif #endif +/* Number of bits in a file offset, on hosts where this is settable. */ +#cmakedefine _FILE_OFFSET_BITS + +/* Define for large files, on AIX-style hosts. */ +#cmakedefine _LARGE_FILES + /* Define to empty if `const' does not conform to ANSI C. */ #cmakedefine H5_const @@ -742,6 +777,9 @@ /* Define to `long int' if <sys/types.h> does not define. */ #cmakedefine H5_off_t +/* Define to `long' if <sys/types.h> does not define. */ +#cmakedefine H5_ptrdiff_t + /* Define to `unsigned long' if <sys/types.h> does not define. */ #cmakedefine H5_size_t diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 99fbea1..3edb3a2 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -34,16 +34,16 @@ MACRO (IDE_SOURCE_PROPERTIES SOURCE_PATH HEADERS SOURCES) ENDMACRO (IDE_SOURCE_PROPERTIES) #------------------------------------------------------------------------------- -MACRO (H5_NAMING target) +MACRO (H5_NAMING target libtype) IF (WIN32 AND NOT MINGW) - IF (BUILD_SHARED_LIBS) + IF (${libtype} MATCHES "SHARED") IF (H5_LEGACY_NAMING) SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "dll") SET_TARGET_PROPERTIES (${target} PROPERTIES PREFIX "${target}") ELSE (H5_LEGACY_NAMING) SET_TARGET_PROPERTIES (${target} PROPERTIES OUTPUT_NAME "${target}dll") ENDIF (H5_LEGACY_NAMING) - ENDIF (BUILD_SHARED_LIBS) + ENDIF (${libtype} MATCHES "SHARED") ENDIF (WIN32 AND NOT MINGW) ENDMACRO (H5_NAMING) @@ -73,8 +73,14 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) SET (LIB_DEBUG_NAME "lib${libname}_D") ENDIF (H5_LEGACY_NAMING) ELSE (WIN32 AND NOT MINGW) - SET (LIB_RELEASE_NAME "lib${libname}") - SET (LIB_DEBUG_NAME "lib${libname}_debug") + # if the generator supports configuration types or if the CMAKE_BUILD_TYPE has a value + IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + SET (LIB_RELEASE_NAME "${libname}") + SET (LIB_DEBUG_NAME "${libname}_debug") + ELSE (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) + SET (LIB_RELEASE_NAME "lib${libname}") + SET (LIB_DEBUG_NAME "lib${libname}_debug") + ENDIF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) ENDIF (WIN32 AND NOT MINGW) ENDIF (${libtype} MATCHES "SHARED") @@ -87,16 +93,16 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) ) #----- Use MSVC Naming conventions for Shared Libraries - IF (MINGW AND BUILD_SHARED_LIBS) + IF (MINGW AND ${libtype} MATCHES "SHARED") SET_TARGET_PROPERTIES (${libtarget} PROPERTIES IMPORT_SUFFIX ".lib" IMPORT_PREFIX "" PREFIX "" ) - ENDIF (MINGW AND BUILD_SHARED_LIBS) + ENDIF (MINGW AND ${libtype} MATCHES "SHARED") - IF (BUILD_SHARED_LIBS) + IF (${libtype} MATCHES "SHARED") IF (WIN32) SET (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR}) ELSE (WIN32) @@ -104,7 +110,7 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) ENDIF (WIN32) SET_TARGET_PROPERTIES (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) SET_TARGET_PROPERTIES (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION}) - ENDIF (BUILD_SHARED_LIBS) + ENDIF (${libtype} MATCHES "SHARED") #-- Apple Specific install_name for libraries IF (APPLE) @@ -121,38 +127,15 @@ MACRO (H5_SET_LIB_OPTIONS libtarget libname libtype) ENDMACRO (H5_SET_LIB_OPTIONS) #------------------------------------------------------------------------------- -MACRO (TARGET_WIN_PROPERTIES target) +MACRO (TARGET_FORTRAN_WIN_PROPERTIES target addlinkflags) IF (WIN32) IF (MSVC) - IF (NOT BUILD_SHARED_LIBS) - SET_TARGET_PROPERTIES (${target} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (NOT BUILD_SHARED_LIBS) + SET_TARGET_PROPERTIES (${target} + PROPERTIES + COMPILE_FLAGS "/dll" + LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}" + ) ENDIF (MSVC) ENDIF (WIN32) -ENDMACRO (TARGET_WIN_PROPERTIES) - -#------------------------------------------------------------------------------- -MACRO (TARGET_FORTRAN_WIN_PROPERTIES target) - IF (WIN32) - IF (BUILD_SHARED_LIBS) - IF (MSVC) - SET_TARGET_PROPERTIES (${target} - PROPERTIES - COMPILE_FLAGS "/dll" - LINK_FLAGS "/SUBSYSTEM:CONSOLE" - ) - ENDIF (MSVC) - ELSE (BUILD_SHARED_LIBS) - IF (MSVC) - SET_TARGET_PROPERTIES (${target} - PROPERTIES - LINK_FLAGS "/NODEFAULTLIB:MSVCRT" - ) - ENDIF (MSVC) - ENDIF (BUILD_SHARED_LIBS) - ENDIF (WIN32) ENDMACRO (TARGET_FORTRAN_WIN_PROPERTIES) diff --git a/config/cmake/cacheinit.cmake b/config/cmake/cacheinit.cmake index 7ca38e1..3375c2b 100755 --- a/config/cmake/cacheinit.cmake +++ b/config/cmake/cacheinit.cmake @@ -18,18 +18,38 @@ SET (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE) SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)
-SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
+SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
+
+SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
+
+SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
+
+SET (HDF5_USE_H5DUMP_PACKED_BITS OFF CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE)
SET (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)
+SET (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)
+
SET (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)
-SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
+SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
-SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
+SET (HDF5_ENABLE_USING_MEMCHECKER OFF CACHE BOOL "Indicate that a memory checker is used" FORCE)
-SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
+SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
-SET (HDF5_USE_H5DUMP_PACKED_BITS OFF CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE)
+SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)
-SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
+SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
+
+SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
+
+SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)
+
+SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)
+
+SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)
+
+SET (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+
+SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
diff --git a/config/cmake/grepTest.cmake b/config/cmake/grepTest.cmake index cc3a9b4..9b5148c 100644 --- a/config/cmake/grepTest.cmake +++ b/config/cmake/grepTest.cmake @@ -1,4 +1,4 @@ -# runTest.cmake executes a command and captures the output in a file. File is then compared +# grepTest.cmake executes a command and captures the output in a file. File is then compared # against a reference file. Exit status of command can also be compared. # arguments checking diff --git a/config/cmake/hdf5-config.cmake.build.in b/config/cmake/hdf5-config.cmake.build.in index 32bab7c..47a119a 100644 --- a/config/cmake/hdf5-config.cmake.build.in +++ b/config/cmake/hdf5-config.cmake.build.in @@ -11,6 +11,10 @@ SET (HDF5_BUILD_FORTRAN @HDF5_BUILD_FORTRAN@) SET (HDF5_BUILD_CPP_LIB @HDF5_BUILD_CPP_LIB@)
SET (HDF5_BUILD_TOOLS @HDF5_BUILD_TOOLS@)
SET (HDF5_BUILD_HL_LIB @HDF5_BUILD_HL_LIB@)
+SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
+SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
+SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
+SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
#-----------------------------------------------------------------------------
# Directories
@@ -29,6 +33,10 @@ IF (HDF5_BUILD_HL_LIB) SET (HDF5_INCLUDE_DIR_HL ${HDF5_INCLUDE_DIR} )
ENDIF (HDF5_BUILD_HL_LIB)
+IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+ SET (HDF5_INCLUDE_DIR_HL_CPP ${HDF5_INCLUDE_DIR} )
+ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+
IF (HDF5_BUILD_TOOLS)
SET (HDF5_INCLUDE_DIR_TOOLS ${HDF5_INCLUDE_DIR} )
ENDIF (HDF5_BUILD_TOOLS)
diff --git a/config/cmake/hdf5-config.cmake.install.in b/config/cmake/hdf5-config.cmake.install.in index ba5ba9a..dadbeb6 100644 --- a/config/cmake/hdf5-config.cmake.install.in +++ b/config/cmake/hdf5-config.cmake.install.in @@ -11,6 +11,10 @@ SET (HDF5_BUILD_FORTRAN @HDF5_BUILD_FORTRAN@) SET (HDF5_BUILD_CPP_LIB @HDF5_BUILD_CPP_LIB@)
SET (HDF5_BUILD_TOOLS @HDF5_BUILD_TOOLS@)
SET (HDF5_BUILD_HL_LIB @HDF5_BUILD_HL_LIB@)
+SET (HDF5_ENABLE_Z_LIB_SUPPORT @HDF5_ENABLE_Z_LIB_SUPPORT@)
+SET (HDF5_ENABLE_SZIP_SUPPORT @HDF5_ENABLE_SZIP_SUPPORT@)
+SET (HDF5_ENABLE_SZIP_ENCODING @HDF5_ENABLE_SZIP_ENCODING@)
+SET (BUILD_SHARED_LIBS @BUILD_SHARED_LIBS@)
#-----------------------------------------------------------------------------
# Directories
@@ -29,6 +33,10 @@ IF (HDF5_BUILD_HL_LIB) SET (HDF5_INCLUDE_DIR_HL "@CMAKE_INSTALL_PREFIX@/include/hl" )
ENDIF (HDF5_BUILD_HL_LIB)
+IF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+ SET (HDF5_INCLUDE_DIR_HL_CPP "@CMAKE_INSTALL_PREFIX@/include/hl/cpp" )
+ENDIF (HDF5_BUILD_HL_LIB AND HDF5_BUILD_CPP_LIB)
+
IF (HDF5_BUILD_TOOLS)
SET (HDF5_INCLUDE_DIR_TOOLS "@CMAKE_INSTALL_PREFIX@/include/tools" )
ENDIF (HDF5_BUILD_TOOLS)
diff --git a/config/cmake/libhdf5.settings.cmake.in b/config/cmake/libhdf5.settings.cmake.in index a3032e5..ba233e8 100644 --- a/config/cmake/libhdf5.settings.cmake.in +++ b/config/cmake/libhdf5.settings.cmake.in @@ -65,4 +65,4 @@ Clear file buffers before write: @CLEARFILEBUF@ GPFS: @GPFS@ Strict File Format Checks: @STRICT_FORMAT_CHECKS@ Optimization Instrumentation: @INSTRUMENT@ - Linux Large File Support (LFS): @LINUX_LFS@ + Large File Support (LFS): @LARGEFILE@ diff --git a/config/cmake/mccacheinit.cmake b/config/cmake/mccacheinit.cmake new file mode 100755 index 0000000..2086991 --- /dev/null +++ b/config/cmake/mccacheinit.cmake @@ -0,0 +1,58 @@ +# This is the CMakeCache file.
+
+########################
+# EXTERNAL cache entries
+########################
+
+SET (BUILD_SHARED_LIBS OFF CACHE BOOL "Build Shared Libraries" FORCE)
+
+SET (BUILD_TESTING ON CACHE BOOL "Build HDF5 Unit Testing" FORCE)
+
+SET (HDF5_BUILD_CPP_LIB ON CACHE BOOL "Build HDF5 C++ Library" FORCE)
+
+SET (HDF5_BUILD_EXAMPLES ON CACHE BOOL "Build HDF5 Library Examples" FORCE)
+
+SET (HDF5_BUILD_FORTRAN ON CACHE BOOL "Build FORTRAN support" FORCE)
+
+SET (HDF5_BUILD_HL_LIB ON CACHE BOOL "Build HIGH Level HDF5 Library" FORCE)
+
+SET (HDF5_BUILD_TOOLS ON CACHE BOOL "Build HDF5 Tools" FORCE)
+
+SET (HDF5_ENABLE_Z_LIB_SUPPORT ON CACHE BOOL "Enable Zlib Filters" FORCE)
+
+SET (HDF5_ENABLE_SZIP_SUPPORT ON CACHE BOOL "Use SZip Filter" FORCE)
+
+SET (HDF5_ENABLE_SZIP_ENCODING ON CACHE BOOL "Use SZip Encoding" FORCE)
+
+SET (HDF5_USE_H5DUMP_PACKED_BITS OFF CACHE BOOL "Use the PACKED BITS feature in h5dump" FORCE)
+
+SET (HDF5_ENABLE_HSIZET ON CACHE BOOL "Enable datasets larger than memory" FORCE)
+
+SET (HDF5_ENABLE_DEPRECATED_SYMBOLS ON CACHE BOOL "Enable deprecated public API symbols" FORCE)
+
+SET (HDF5_ENABLE_PARALLEL OFF CACHE BOOL "Enable parallel build (requires MPI)" FORCE)
+
+SET (HDF5_ENABLE_COVERAGE OFF CACHE BOOL "Enable code coverage for Libraries and Programs" FORCE)
+
+SET (HDF5_ENABLE_USING_MEMCHECKER ON CACHE BOOL "Indicate that a memory checker is used" FORCE)
+
+SET (HDF5_DISABLE_COMPILER_WARNINGS OFF CACHE BOOL "Disable compiler warnings" FORCE)
+
+SET (HDF5_USE_16_API_DEFAULT OFF CACHE BOOL "Use the HDF5 1.6.x API by default" FORCE)
+
+SET (HDF5_ENABLE_THREADSAFE OFF CACHE BOOL "(WINDOWS)Enable Threadsafety" FORCE)
+
+SET (HDF5_PACKAGE_EXTLIBS OFF CACHE BOOL "(WINDOWS)CPACK - include external libraries" FORCE)
+
+SET (HDF5_ALLOW_EXTERNAL_SUPPORT "NO" CACHE STRING "Allow External Library Building" FORCE)
+
+SET (ZLIB_SVN_URL "http://svn.hdfgroup.uiuc.edu/zlib/trunk" CACHE STRING "Use ZLib from HDF repository" FORCE)
+
+SET (SZIP_SVN_URL "http://svn.hdfgroup.uiuc.edu/szip/trunk" CACHE STRING "Use SZip from HDF repository" FORCE)
+
+SET (ZLIB_TGZ_NAME "ZLib.tar.gz" CACHE STRING "Use ZLib from compressed file" FORCE)
+
+SET (SZIP_TGZ_NAME "SZip.tar.gz" CACHE STRING "Use SZip from compressed file" FORCE)
+
+SET (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build Debug" FORCE)
+
diff --git a/config/cmake/runTest.cmake b/config/cmake/runTest.cmake index ed415f7..26acc39 100644 --- a/config/cmake/runTest.cmake +++ b/config/cmake/runTest.cmake @@ -28,6 +28,10 @@ SET (ERROR_APPEND 1) MESSAGE (STATUS "COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}") +IF (TEST_ENV_VAR) + SET (ENV{${TEST_ENV_VAR}} "${TEST_ENV_VALUE}") +ENDIF (TEST_ENV_VAR) + # run the test program, capture the stdout/stderr and the result var EXECUTE_PROCESS ( COMMAND ${TEST_PROGRAM} ${TEST_ARGS} @@ -59,11 +63,28 @@ MESSAGE (STATUS "COMMAND Error: ${TEST_ERROR}") IF (TEST_MASK) 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 "Storage:[^\n]+\n" "Storage: <details removed for portability>\n" TEST_STREAM "${TEST_STREAM}") FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") ENDIF (TEST_MASK) +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}") + FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") +ENDIF (TEST_MASK_MOD) + +IF (TEST_MASK_ERROR) + FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) + STRING(REGEX REPLACE "thread [0-9]*:" "thread (IDs):" TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE ": ([^\n]*)[.]c " ": (file name) " TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE "line [0-9]*" "line (number)" TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE "v[1-9]*[.][0-9]*[.]" "version (number)." TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE "[1-9]*[.][0-9]*[.][0-9]*[^)]*" "version (number)" TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE "H5Eget_auto[1-2]*" "H5Eget_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") + STRING(REGEX REPLACE "H5Eset_auto[1-2]*" "H5Eset_auto(1 or 2)" TEST_STREAM "${TEST_STREAM}") + FILE (WRITE ${TEST_FOLDER}/${TEST_OUTPUT} "${TEST_STREAM}") +ENDIF (TEST_MASK_ERROR) + IF (TEST_FILTER) FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT} TEST_STREAM) STRING(REGEX REPLACE "${TEST_FILTER}" "" TEST_STREAM "${TEST_STREAM}") @@ -77,14 +98,16 @@ ENDIF (WIN32 AND NOT MINGW) # now compare the output with the reference EXECUTE_PROCESS ( - COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_OUTPUT} ${TEST_REFERENCE} + COMMAND ${CMAKE_COMMAND} -E compare_files ${TEST_FOLDER}/${TEST_OUTPUT} ${TEST_FOLDER}/${TEST_REFERENCE} RESULT_VARIABLE TEST_RESULT ) +MESSAGE (STATUS "COMPARE Result: ${TEST_RESULT}") + # again, if return value is !=0 scream and shout -IF (TEST_RESULT) +IF (NOT ${TEST_RESULT} STREQUAL 0) MESSAGE (FATAL_ERROR "Failed: The output of ${TEST_PROGRAM} did not match ${TEST_REFERENCE}") -ENDIF (TEST_RESULT) +ENDIF (NOT ${TEST_RESULT} STREQUAL 0) # everything went fine... MESSAGE ("Passed: The output of ${TEST_PROGRAM} matches ${TEST_REFERENCE}") diff --git a/config/cmake/vfdTest.cmake b/config/cmake/vfdTest.cmake index eaa019a..2e854fb 100644 --- a/config/cmake/vfdTest.cmake +++ b/config/cmake/vfdTest.cmake @@ -1,5 +1,5 @@ -# runTest.cmake executes a command and captures the output in a file. File is then compared -# against a reference file. Exit status of command can also be compared. +# vfdTest.cmake executes a command and captures the output in a file. Command uses specified VFD. +# Exit status of command can also be compared. # arguments checking IF (NOT TEST_PROGRAM) @@ -18,6 +18,8 @@ IF (NOT TEST_VFD) MESSAGE (FATAL_ERROR "Require TEST_VFD to be defined") ENDIF (NOT TEST_VFD) +SET (ERROR_APPEND 1) + MESSAGE (STATUS "USING ${TEST_VFD} ON COMMAND: ${TEST_PROGRAM} ${TEST_ARGS}") SET (ENV{HDF5_DRIVER} "${TEST_VFD}") @@ -25,12 +27,19 @@ SET (ENV{HDF5_DRIVER} "${TEST_VFD}") EXECUTE_PROCESS ( COMMAND ${TEST_PROGRAM} ${TEST_ARGS} WORKING_DIRECTORY ${TEST_FOLDER} + OUTPUT_FILE ${TEST_OUTPUT}_${TEST_VFD}.out + ERROR_FILE ${TEST_OUTPUT}_${TEST_VFD}.err OUTPUT_VARIABLE TEST_ERROR ERROR_VARIABLE TEST_ERROR ) MESSAGE (STATUS "COMMAND Result: ${TEST_RESULT}") +IF (ERROR_APPEND) + FILE (READ ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.err TEST_STREAM) + FILE (APPEND ${TEST_FOLDER}/${TEST_OUTPUT}_${TEST_VFD}.out "${TEST_STREAM}") +ENDIF (ERROR_APPEND) + # if the return value is !=${TEST_EXPECT} bail out IF (NOT ${TEST_RESULT} STREQUAL ${TEST_EXPECT}) MESSAGE ( FATAL_ERROR "Failed: Test program ${TEST_PROGRAM} exited != ${TEST_EXPECT}.\n${TEST_ERROR}") diff --git a/config/examples.am b/config/examples.am index 30ea717..244e695 100644 --- a/config/examples.am +++ b/config/examples.am @@ -67,7 +67,8 @@ uninstall-local: install-examples: $(EXAMPLEDIR) $(INSTALL_FILES) @for f in X $(INSTALL_FILES); do \ if test $$f != X; then \ - (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1);\ + (set -x; $(INSTALL) $(srcdir)/$$f $(EXAMPLEDIR)/. || exit 1); \ + chmod a-x $(EXAMPLEDIR)/$$f; \ fi; \ done @for f in X $(INSTALL_SCRIPT_FILES); do \ diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu index 1961119..519d0fc 100644 --- a/config/ia64-linux-gnu +++ b/config/ia64-linux-gnu @@ -32,7 +32,7 @@ fi # Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used. if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpicc; then - RUNPARALLEL=${RUNPARALLEL="mpirun -np \$\${NPROCS:=3}"} + RUNPARALLEL=${RUNPARALLEL="mpirun -np \$\${NPROCS:=6}"} fi #---------------------------------------------------------------------------- diff --git a/config/ibm-aix b/config/ibm-aix index 134ad8e..ab934a7 100644 --- a/config/ibm-aix +++ b/config/ibm-aix @@ -31,14 +31,16 @@ if test "X-" = "X-$CC"; then fi # Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used. -if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then - RUNPARALLEL=${RUNPARALLEL="env MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} -fi - -# Temporary patch for Bug 1678. -q32 binary default to run with smaller memory. +# Define RUNSERIAL: Temporary patch for Bug 1678. -q32 binary default to run +# with smaller memory. # Ask for more memory so that "make check" will pass. Not necessary for -q64 # mode but it does no harm. -RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA"} +if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then + RUNPARALLEL=${RUNPARALLEL="env LDR_CNTRL=MAXDATA=0x20000000@DSA MP_PROCS=\$\${NPROCS:=6} MP_TASKS_PER_NODE=\$\${NPROCS:=6} poe"} + RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA MP_PROCS=1 MP_TASKS_PER_NODE=1 poe"} +else + RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA"} +fi #---------------------------------------------------------------------------- diff --git a/config/ibm-aix6.x b/config/ibm-aix6.x new file mode 100644 index 0000000..104008a --- /dev/null +++ b/config/ibm-aix6.x @@ -0,0 +1,21 @@ +# -*- shell-script -*- +# +# Copyright by The HDF Group. +# All rights reserved. +# +# This file is part of HDF5. The full HDF5 copyright notice, including +# terms governing use, modification, and redistribution, is contained in +# the files COPYING and Copyright.html. COPYING can be found at the root +# of the source code distribution tree; Copyright.html can be found at the +# root level of an installed copy of the electronic HDF5 document set and +# is linked from the top-level documents page. It can also be found at +# http://hdfgroup.org/HDF5/doc/Copyright.html. If you do not have +# access to either file, you may request a copy from help@hdfgroup.org. + +# Configuration file for building on the IBM AIX 6.X platforms. +# This file is part of the HDF5 build script. It is processed shortly +# after configure starts and defines, among other things, flags for +# the various compile modes. + +# Use the generic ibm-aix. +. $srcdir/config/ibm-aix diff --git a/config/ibm-flags b/config/ibm-flags index 9e63f79..5e092b8 100644 --- a/config/ibm-flags +++ b/config/ibm-flags @@ -28,7 +28,7 @@ # if test X = "X$cc_flags_set"; then # Verify this is an IBM XL compiler - cc_version="`$CC $CFLAGS -qversion 2>&1 | grep '^IBM XL C/C++'`" + cc_version="`$CC $CFLAGS -qversion 2>&1 | grep 'IBM XL C/C++'`" if test X != "X$cc_version"; then cc_vendor="XL" cc_version="`$CC $CFLAGS -qversion 2>&1 | sed -n 's/Version: \([0-9\.]*\).*/\1/p'`" diff --git a/config/intel-flags b/config/intel-flags index 5bf06d4..e6a9c31 100644 --- a/config/intel-flags +++ b/config/intel-flags @@ -70,13 +70,8 @@ if test "X-icc" = "X-$cc_vendor"; then # Default to C99 standard. H5_CFLAGS="${H5_CFLAGS:--std=c99 $arch}" - # Production - # -Wl,-s to remove all symbols for smaller file - # O3 optimization causes compilation failures on many platforms; - # the problem exists in all versions of the icc compiler up to the latest 9.1 - # I changed optimization flag to default -O2. EIP, 2006-08-15 - #PROD_CFLAGS="-O3 -Wl,-s" - PROD_CFLAGS="-O2 -Wl,-s" + # Production is set to default; see settings for specific version further down + PROD_CFLAGS="-O" PROD_CPPFLAGS= # Debug @@ -98,6 +93,11 @@ fi # Please follow the pattern below by adding new versions at the top, copying # the information from the previous version and adding modifications to that. case "$cc_vendor-$cc_version" in + icc-11*) + # -s became obsolete; we also fixed bugs that allow us to enable higher level + # of optimization starting with 1.8.7 + PROD_CFLAGS="-O3" + ;; icc-10*) PROD_CFLAGS="-O1 -Wl,-s" ;; diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1 index 26a0c3a..8f04cf0 100644 --- a/config/linux-gnulibc1 +++ b/config/linux-gnulibc1 @@ -22,8 +22,14 @@ # The default compiler is `gcc'. if test -z "$CC"; then - CC=gcc - CC_BASENAME=gcc + if test "X-$enable_parallel" = "X-yes"; then + # default to use mpicc which is the defacto MPI compiler name + CC=mpicc + CC_BASENAME=mpicc + else + CC=gcc + CC_BASENAME=gcc + fi fi # Figure out GNU C compiler flags diff --git a/config/lt_vers.am b/config/lt_vers.am index 0d5db8d..7db6cff 100644 --- a/config/lt_vers.am +++ b/config/lt_vers.am @@ -17,7 +17,7 @@ # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 66 +LT_VERS_REVISION = 70 LT_VERS_AGE = 0 ## If the API changes *at all*, increment LT_VERS_INTERFACE and diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x index b39fb47..50a4e8c 100644 --- a/config/powerpc-ibm-aix5.x +++ b/config/powerpc-ibm-aix5.x @@ -1,7 +1,6 @@ # -*- shell-script -*- # # Copyright by The HDF Group. -# Copyright by the Board of Trustees of the University of Illinois. # All rights reserved. # # This file is part of HDF5. The full HDF5 copyright notice, including @@ -18,151 +17,5 @@ # after configure starts and defines, among other things, flags for # the various compile modes. -# Use AIX supplied C compiler by default, xlc for serial, mpcc_r for parallel. -# Make sure this is applied to other API compile options such as C++. -if test "X-" = "X-$CC"; then - if test "X-$enable_parallel" = "X-yes"; then - CC=mpcc_r - CC_BASENAME=mpcc_r - else - CC=xlc - CC_BASENAME=xlc - fi -fi - -# Define RUNPARALLEL if parallel mode is enabled or a parallel compiler used. -if test "X-$enable_parallel" = "X-yes" -o X-$CC_BASENAME = X-mpcc_r; then - RUNPARALLEL=${RUNPARALLEL="env MP_PROCS=\$\${NPROCS:=3} MP_TASKS_PER_NODE=\$\${NPROCS:=3} poe"} -fi - -# Temporary patch for Bug 1678. -q32 binary default to run with smaller memory. -# Ask for more memory so that "make check" will pass. Not necessary for -q64 -# mode but it does no harm. -RUNSERIAL=${RUNSERIAL="env LDR_CNTRL=MAXDATA=0x20000000@DSA"} - - -#---------------------------------------------------------------------------- -# Compiler flags. The CPPFLAGS values should not include package debug -# flags like `-DH5G_DEBUG' since these are added with the -# `--enable-debug' switch of configure. - -case $CC_BASENAME in - xlc|xlc-*|mpcc_r|mpcc_r-*) - # Turn off shared lib option. It causes some test suite to fail. - enable_shared="${enable_shared:-no}" - # Make sure this is applied to other API compile options such as C++. - AM_CFLAGS="$AM_CFLAGS" - H5_CFLAGS="-qlanglvl=stdc99 $H5_CFLAGS" - DEBUG_CFLAGS="-g -qfullpath" - DEBUG_CPPFLAGS= - # -O causes test/dtypes to fail badly. Turn it off for now. - PROD_CFLAGS="" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-g -qfullpath -pg" - PROFILE_CPPFLAGS= - ;; - - gcc) - . $srcdir/config/gnu-flags - ;; - - *) - H5_CFLAGS="$H5_CFLAGS -ansi" - DEBUG_CFLAGS="-g" - DEBUG_CPPFLAGS= - PROD_CFLAGS="-O" - PROD_CPPFLAGS= - PROFILE_CFLAGS="-pg" - PROFILE_CPPFLAGS= - ;; -esac - -#---------------------------------------------------------------------------- -# Values for overriding configuration tests when cross compiling. -# This includes compiling on some machines where the serial front end -# compiles for a parallel back end. - -# Set this to `yes' or `no' depending on whether the target is big -# endian or little endian. -hdf5_cv_printf_ll=${hdf5_cv_printf_ll='ll'} -ac_cv_c_bigendian=${ac_cv_c_bigendian='yes'} -ac_cv_header_stdc=${ac_cv_header_stdc='yes'} -ac_cv_header_sys_ioctl_h=${ac_cv_header_sys_ioctl_h=yes} - -# cache the sizeof of "standard C types" so that configure can run faster. -ac_cv_sizeof_char=${ac_cv_sizeof_char=1} -ac_cv_sizeof_short=${ac_cv_sizeof_short=2} -ac_cv_sizeof_int=${ac_cv_sizeof_int=4} -ac_cv_sizeof_long_long=${ac_cv_sizeof_long_long=8} -ac_cv_sizeof___int64=${ac_cv_sizeof___int64=8} -ac_cv_sizeof_float=${ac_cv_sizeof_float=4} -ac_cv_sizeof_double=${ac_cv_sizeof_double=8} -ac_cv_sizeof_long_double=${ac_cv_sizeof_long_double=8} -ac_cv_sizeof_int8_t=${ac_cv_sizeof_int8_t=1} -ac_cv_sizeof_uint8_t=${ac_cv_sizeof_uint8_t=1} -ac_cv_sizeof_int_least8_t=${ac_cv_sizeof_int_least8_t=1} -ac_cv_sizeof_uint_least8_t=${ac_cv_sizeof_uint_least8_t=1} -# Do not cache int_fast8_t since the vendor changes often. -ac_cv_sizeof_int16_t=${ac_cv_sizeof_int16_t=2} -ac_cv_sizeof_uint16_t=${ac_cv_sizeof_uint16_t=2} -ac_cv_sizeof_int_least16_t=${ac_cv_sizeof_int_least16_t=2} -ac_cv_sizeof_uint_least16_t=${ac_cv_sizeof_uint_least16_t=2} -# Do not cache int_fast16_t since the vendor changes often. -ac_cv_sizeof_int32_t=${ac_cv_sizeof_int32_t=4} -ac_cv_sizeof_uint32_t=${ac_cv_sizeof_uint32_t=4} -ac_cv_sizeof_int_least32_t=${ac_cv_sizeof_int_least32_t=4} -ac_cv_sizeof_uint_least32_t=${ac_cv_sizeof_uint_least32_t=4} -ac_cv_sizeof_int_fast32_t=${ac_cv_sizeof_int_fast32_t=4} -ac_cv_sizeof_uint_fast32_t=${ac_cv_sizeof_uint_fast32_t=4} -ac_cv_sizeof_int64_t=${ac_cv_sizeof_int64_t=8} -ac_cv_sizeof_uint64_t=${ac_cv_sizeof_uint64_t=8} -ac_cv_sizeof_int_least64_t=${ac_cv_sizeof_int_least64_t=8} -ac_cv_sizeof_uint_least64_t=${ac_cv_sizeof_uint_least64_t=8} -ac_cv_sizeof_int_fast64_t=${ac_cv_sizeof_int_fast64_t=8} -ac_cv_sizeof_uint_fast64_t=${ac_cv_sizeof_uint_fast64_t=8} - -# Don't cache long since it varies between 32 and 64 bits -#ac_cv_sizeof_long=${ac_cv_sizeof_long=4} - -# The default Fortran 90 compiler - -if test "X-" = "X-$FC"; then - if test "X-$enable_parallel" = "X-yes"; then - FC=mpxlf90_r - else - FC=xlf90 - fi -fi - -# While we try to avoid setting FCFLAGS directly for use in compilation, in -# this case we need the -k flag present for some configure checks. As such, -# the configure script saves the user's set FCFLAGS before running, and -# restores them when complete. We must then set up both FCFLAGS and H5_FCFLAGS -# to ensure the flag is present for both configure as well as for the build. -if test "X-" = "X-$f9x_flags_set"; then - F9XSUFFIXFLAG="-qsuffix=f=f90" - FCFLAGS="$FCFLAGS -O ${F9XSUFFIXFLAG}" - H5_FCFLAGS="$H5_FCFLAGS -O ${F9XSUFFIXFLAG}" - FSEARCH_DIRS="-I./ -I../src" - DEBUG_FCFLAGS="-O" - PROD_FCFLAGS="-O" - PROFILE_FCFLAGS="-O" - f9x_flags_set=yes -fi - -# With poe version 3.2.0.19 or lower(using lpp -l all | grep ppe.poe to check the version number, -# IBM MPI-IO implementation has a bug, -#it cannot generate correct MPI derived datatype. Please uncomment the following line: -#hdf5_cv_mpi_complex_derived_datatype_works=${hdf5_cv_mpi_complex_derived_datatype_works='no'} - -# The default C++ compiler - -# Use AIX supplied C++ compiler by default. -CXX=${CXX=xlC} - -# Added -qweaksymbol to suppress linker messages warning of duplicate -# symbols; these warnings are harmless. - BMR -H5_CXXFLAGS="$H5_CXXFLAGS -qweaksymbol" -AM_CXXFLAGS="$AM_CXXFLAGS" - - +# Use the generic ibm-aix. +. $srcdir/config/ibm-aix |