diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2016-09-21 17:22:53 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2016-09-21 17:22:53 (GMT) |
| commit | be3ad22522825d170e50a513c2937ca69799d82a (patch) | |
| tree | 7c2f297900393d867560885664b8fd604e421143 | |
| parent | f240c5c4221473f6172c6c869bcb268cf7b36da3 (diff) | |
| parent | 583af563d9f7eb8cedba6a8bb12d3218f55addf6 (diff) | |
| download | hdf5-be3ad22522825d170e50a513c2937ca69799d82a.zip hdf5-be3ad22522825d170e50a513c2937ca69799d82a.tar.gz hdf5-be3ad22522825d170e50a513c2937ca69799d82a.tar.bz2 | |
Merge pull request #38 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '583af563d9f7eb8cedba6a8bb12d3218f55addf6':
Add missing target depends command
Correct clear objects working dir
| -rw-r--r-- | fortran/test/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | hl/fortran/src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/h5ls/CMakeTests.cmake | 1 | ||||
| -rw-r--r-- | tools/h5ls/CMakeTestsVDS.cmake | 3 |
4 files changed, 8 insertions, 1 deletions
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt index baf7369..219f937 100644 --- a/fortran/test/CMakeLists.txt +++ b/fortran/test/CMakeLists.txt @@ -148,6 +148,8 @@ if (WIN32) COMPILE_DEFINITIONS "HDF5F90_WINDOWS" ) endif (WIN32) +add_dependencies(${HDF5_F90_TEST_LIB_TARGET} H5testgen) + if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_library (${HDF5_F90_TEST_LIBSH_TARGET} SHARED ${HDF5_F90_TF_SOURCES_SHARED}) set (SHARED_LINK_FLAGS " ") @@ -175,6 +177,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) COMPILE_DEFINITIONS "BUILD_HDF5_TEST_DLL;HDF5F90_WINDOWS" ) endif (WIN32) + add_dependencies(${HDF5_F90_TEST_LIBSH_TARGET} H5testgenSH) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) #----------------------------------------------------------------------------- diff --git a/hl/fortran/src/CMakeLists.txt b/hl/fortran/src/CMakeLists.txt index ead8aec..774aa7c 100644 --- a/hl/fortran/src/CMakeLists.txt +++ b/hl/fortran/src/CMakeLists.txt @@ -185,6 +185,7 @@ if (WIN32) ) endif (WIN32) set (install_targets ${install_targets} ${HDF5_HL_F90_LIB_TARGET}) +add_dependencies(${HDF5_HL_F90_LIB_TARGET} H5HLgen) if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) add_library (${HDF5_HL_F90_LIBSH_TARGET} SHARED ${HDF5_HL_F90_F_SOURCES_SHARED}) @@ -209,6 +210,7 @@ if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) ) endif (WIN32) set (install_targets ${install_targets} ${HDF5_HL_F90_LIBSH_TARGET}) + add_dependencies(${HDF5_HL_F90_LIBSH_TARGET} H5HLgenSH) endif (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) #----------------------------------------------------------------------------- diff --git a/tools/h5ls/CMakeTests.cmake b/tools/h5ls/CMakeTests.cmake index 009ea79..2367df8 100644 --- a/tools/h5ls/CMakeTests.cmake +++ b/tools/h5ls/CMakeTests.cmake @@ -258,6 +258,7 @@ tvldtypes2be.out tvldtypes2be.out.err ) + set_tests_properties (H5LS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles") if (NOT "${last_test}" STREQUAL "") set_tests_properties (H5LS-clearall-objects PROPERTIES DEPENDS ${last_test}) endif (NOT "${last_test}" STREQUAL "") diff --git a/tools/h5ls/CMakeTestsVDS.cmake b/tools/h5ls/CMakeTestsVDS.cmake index 0d08774..e6c216d 100644 --- a/tools/h5ls/CMakeTestsVDS.cmake +++ b/tools/h5ls/CMakeTestsVDS.cmake @@ -73,7 +73,7 @@ add_test ( NAME H5LS-${resultfile}-clear-objects COMMAND ${CMAKE_COMMAND} - -E remove ./testfiles/${resultfile}.out ./testfiles/vds/${resultfile}.out.err + -E remove ./testfiles/vds/${resultfile}.out ./testfiles/vds/${resultfile}.out.err ) add_test ( NAME H5LS-${resultfile} @@ -127,6 +127,7 @@ tvds_layout-5.out tvds_layout-5.out.err ) + set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/testfiles/vds") if (NOT "${last_test}" STREQUAL "") set_tests_properties (H5LS_VDS-clearall-objects PROPERTIES DEPENDS ${last_test}) endif (NOT "${last_test}" STREQUAL "") |