diff options
| author | Jordan Henderson <jhenderson@hdfgroup.org> | 2018-08-01 16:29:59 (GMT) |
|---|---|---|
| committer | Jordan Henderson <jhenderson@hdfgroup.org> | 2018-08-01 16:29:59 (GMT) |
| commit | 07c33d0eb86a990b1babf0f9718578fe2755ff5d (patch) | |
| tree | 31f04cc7634deb270ab48b34e92e89e562c3fba3 /testpar | |
| parent | 9002612504799bfc7cf968b73fea0dd2b36b14b8 (diff) | |
| parent | 3e7979902ade13ba8f37e020e5ae95f03a82b0f9 (diff) | |
| download | hdf5-07c33d0eb86a990b1babf0f9718578fe2755ff5d.zip hdf5-07c33d0eb86a990b1babf0f9718578fe2755ff5d.tar.gz hdf5-07c33d0eb86a990b1babf0f9718578fe2755ff5d.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit '3e7979902ade13ba8f37e020e5ae95f03a82b0f9':
Merge pull request #1158 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cpp4:develop to develop
Merge from develop
Diffstat (limited to 'testpar')
| -rw-r--r-- | testpar/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testpar/CMakeLists.txt b/testpar/CMakeLists.txt index e843811..c08a69e 100644 --- a/testpar/CMakeLists.txt +++ b/testpar/CMakeLists.txt @@ -26,7 +26,7 @@ target_include_directories(testphdf5 ) TARGET_C_PROPERTIES (testphdf5 STATIC) target_link_libraries (testphdf5 - PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}> + PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" ) set_target_properties (testphdf5 PROPERTIES FOLDER test/par) @@ -37,7 +37,7 @@ MACRO (ADD_H5P_EXE file) ) TARGET_C_PROPERTIES (${file} STATIC) target_link_libraries (${file} - PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}> + PRIVATE ${HDF5_TEST_LIB_TARGET} ${HDF5_LIB_TARGET} "$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_LIBRARIES}>" ) set_target_properties (${file} PROPERTIES FOLDER test/par) ENDMACRO (ADD_H5P_EXE file) |