diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2016-10-05 17:11:28 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2016-10-05 17:11:28 (GMT) |
commit | 783f01f478f99711710b24d8c85b0555dcdcf1fc (patch) | |
tree | 2fce87a76b5dfc7012432d9ce45b0934404f0d51 /config | |
parent | 620bfd58ae44dcf876303efb99482019ebbb9b6a (diff) | |
parent | 8c49b6e05a7d40218b8129b29bd74bbd2b39758d (diff) | |
download | hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.zip hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.tar.gz hdf5-783f01f478f99711710b24d8c85b0555dcdcf1fc.tar.bz2 |
Merge pull request #57 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
All changes tested in Buildbot and locally.
* commit '8c49b6e05a7d40218b8129b29bd74bbd2b39758d':
HDFFV-9991: Remove uneeded file
Fix missing defines for standalone perf
Remove hanging property set
Revert clear objects for testfile removal
Merge test output file clearing into runTest.cmake
Move clear-objects inside runTest
Diffstat (limited to 'config')
-rw-r--r-- | config/cmake/FindHDF5.cmake.in | 86 | ||||
-rw-r--r-- | config/cmake_ext_mod/runTest.cmake | 8 |
2 files changed, 8 insertions, 86 deletions
diff --git a/config/cmake/FindHDF5.cmake.in b/config/cmake/FindHDF5.cmake.in deleted file mode 100644 index fbc49f1..0000000 --- a/config/cmake/FindHDF5.cmake.in +++ /dev/null @@ -1,86 +0,0 @@ -# -# To be used by projects that make use of Cmakeified hdf5-@HDF5_PACKAGE_VERSION@ -# - -# -# Find the HDF5 includes and get all installed hdf5 library settings from -# HDF5-config.cmake file : Requires a CMake compatible hdf5-1.8.5 or later -# for this feature to work. The following vars are set if hdf5 is found. -# -# HDF5_FOUND - True if found, otherwise all other vars are undefined -# HDF5_INCLUDE_DIR - The include dir for main *.h files -# HDF5_FORTRAN_INCLUDE_DIR - The include dir for fortran modules and headers -# HDF5_VERSION_STRING - full version (e.g. @HDF5_PACKAGE_VERSION@) -# HDF5_VERSION_MAJOR - major part of version (e.g. @HDF5_PACKAGE_VERSION_MAJOR@) -# HDF5_VERSION_MINOR - minor part (e.g. @HDF5_PACKAGE_VERSION_MINOR@) -# -# 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 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 -# -# hdf5 : HDF5 C library -# hdf5_tools : the tools library -# hdf5_f90cstub : used by Fortran to C interface -# hdf5_fortran : Fortran HDF5 library -# hdf5_cpp : HDF5 cpp interface library -# hdf5_hl : High Level library -# hdf5_hl_f90cstub : used by Fortran to C interface to High Level library -# hdf5_hl_fortran : Fortran High Level library -# 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_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake lies - -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_PACKAGE@ - /usr/share/@HDF5_PACKAGE@ - /usr/local/@HDF5_PACKAGE@ - /usr/local/@HDF5_PACKAGE@/share -) - -FIND_PATH (HDF5_ROOT_DIR "@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake" - HINTS ${_HDF5_HINTS} - PATHS ${_HDF5_PATHS} - PATH_SUFFIXES - cmake/@HDF5_PACKAGE@ - lib/cmake/@HDF5_PACKAGE@ - share/cmake/@HDF5_PACKAGE@ -) - -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_PACKAGE@@HDF_PACKAGE_EXT@-config.cmake) -endif (HDF5_INCLUDE_DIR) diff --git a/config/cmake_ext_mod/runTest.cmake b/config/cmake_ext_mod/runTest.cmake index 21a65e6..8b47693 100644 --- a/config/cmake_ext_mod/runTest.cmake +++ b/config/cmake_ext_mod/runTest.cmake @@ -25,6 +25,14 @@ if (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE) message (FATAL_ERROR "Require TEST_REFERENCE to be defined") endif (NOT TEST_SKIP_COMPARE AND NOT TEST_REFERENCE) +if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}) + file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}) +endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}) + +if (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err) + file (REMOVE ${TEST_FOLDER}/${TEST_OUTPUT}.err) +endif (EXISTS ${TEST_FOLDER}/${TEST_OUTPUT}.err) + # if there is not an error reference file add the error output to the stdout file if (NOT TEST_ERRREF) set (ERROR_APPEND 1) |