diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-04-04 17:07:50 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-04-04 17:07:50 (GMT) |
commit | 7db14a3f2aad0c89d3e609de27cd0425a53479db (patch) | |
tree | 6a99a0640c0261ab76857460c96ed0d7ba838aeb /fortran | |
parent | 0f859bed9d72623db716ee7ddb015c6ddce6f0e2 (diff) | |
download | hdf5-7db14a3f2aad0c89d3e609de27cd0425a53479db.zip hdf5-7db14a3f2aad0c89d3e609de27cd0425a53479db.tar.gz hdf5-7db14a3f2aad0c89d3e609de27cd0425a53479db.tar.bz2 |
Merge in CMake changes from develop
Diffstat (limited to 'fortran')
-rw-r--r-- | fortran/examples/CMakeTests.cmake | 18 | ||||
-rw-r--r-- | fortran/testpar/CMakeTests.cmake | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/fortran/examples/CMakeTests.cmake b/fortran/examples/CMakeTests.cmake index af6b994..2aa89b5 100644 --- a/fortran/examples/CMakeTests.cmake +++ b/fortran/examples/CMakeTests.cmake @@ -35,7 +35,7 @@ sdsf.h5 subset.h5 ) - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f90_ex-clear-objects PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f90_ex-clear-objects") @@ -58,7 +58,7 @@ sdsf.h5 subset.h5 ) - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f90_ex-shared-clear-objects PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f90_ex-shared-clear-objects") @@ -79,7 +79,7 @@ foreach (example ${examples}) -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) endif () - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f90_ex_${example} PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f90_ex_${example}") @@ -98,7 +98,7 @@ foreach (example ${examples}) -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) endif () - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f90_ex-shared_${example} PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f90_ex-shared_${example}") @@ -121,7 +121,7 @@ if (HDF5_ENABLE_F2003) -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) endif () - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f03_ex_${example} PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f03_ex_${example}") @@ -140,7 +140,7 @@ if (HDF5_ENABLE_F2003) -P "${HDF_RESOURCES_EXT_DIR}/runTest.cmake" ) endif () - if (NOT "${last_test}" STREQUAL "") + if (last_test) set_tests_properties (f03_ex-shared_${example} PROPERTIES DEPENDS ${last_test}) endif () set (last_test "f03_ex-shared_${example}") @@ -149,8 +149,8 @@ if (HDF5_ENABLE_F2003) endif () if (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND) - add_test (NAME f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS}) - if (BUILD_SHARED_LIBS AND NOT SKIP_HDF5_FORTRAN_SHARED) - add_test (NAME f90_ex-shared_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS}) + add_test (NAME MPI_TEST_f90_ex_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS}) + if (BUILD_SHARED_LIBS) + add_test (NAME MPI_TEST_f90_ex-shared_ph5example COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:f90_ex_ph5example> ${MPIEXEC_POSTFLAGS}) endif () endif () diff --git a/fortran/testpar/CMakeTests.cmake b/fortran/testpar/CMakeTests.cmake index d00a6fc..d0abe0e 100644 --- a/fortran/testpar/CMakeTests.cmake +++ b/fortran/testpar/CMakeTests.cmake @@ -15,4 +15,4 @@ ### T E S T I N G ### ############################################################################## ############################################################################## -add_test (NAME FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS}) +add_test (NAME MPI_TEST_FORT_parallel_test COMMAND ${MPIEXEC_EXECUTABLE} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_PREFLAGS} $<TARGET_FILE:parallel_test> ${MPIEXEC_POSTFLAGS}) |