diff options
| author | lrknox <lrknox> | 2018-01-30 15:57:04 (GMT) |
|---|---|---|
| committer | lrknox <lrknox> | 2018-01-30 15:57:04 (GMT) |
| commit | 77ed9e9645dcfc0d277472f2ac7b011f44b423ff (patch) | |
| tree | 370cc0db8d9252805f7bc2c60fe9c4fde1f7505b /testpar | |
| parent | 6cc86417d5357e4fd018346cc332210ad410b203 (diff) | |
| parent | 32c652cbc21f892834fe7dfaf488486e55d5b0ce (diff) | |
| download | hdf5-77ed9e9645dcfc0d277472f2ac7b011f44b423ff.zip hdf5-77ed9e9645dcfc0d277472f2ac7b011f44b423ff.tar.gz hdf5-77ed9e9645dcfc0d277472f2ac7b011f44b423ff.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/~lrknox/hdf5_lrk into develop
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeLists.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index b116d66..d0b74b0 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -28,16 +28,20 @@ set (testphdf5_SOURCES #-- Adding test for testhdf5 add_executable (testphdf5 ${testphdf5_SOURCES}) -TARGET_NAMING (testphdf5 STATIC) TARGET_C_PROPERTIES (testphdf5 STATIC " " " ") -target_link_libraries (testphdf5 ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) +target_link_libraries (testphdf5 PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) +if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND) + target_link_libraries (testphdf5 PRIVATE ${MPI_C_LIBRARIES}) +endif () set_target_properties (testphdf5 PROPERTIES FOLDER test/par) MACRO (ADD_H5P_EXE file) add_executable (${file} ${HDF5_TEST_PAR_SOURCE_DIR}/${file}.c) - TARGET_NAMING (${file} STATIC) TARGET_C_PROPERTIES (${file} STATIC " " " ") - target_link_libraries (${file} ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) + target_link_libraries (${file} PUBLIC ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET}) + if (HDF5_ENABLE_PARALLEL AND MPI_C_FOUND) + target_link_libraries (${file} PRIVATE ${MPI_C_LIBRARIES}) + endif () set_target_properties (${file} PROPERTIES FOLDER test/par) ENDMACRO (ADD_H5P_EXE file) |