summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorVailin Choi <vchoi@hdfgroup.org>2018-05-23 19:27:05 (GMT)
committerVailin Choi <vchoi@hdfgroup.org>2018-05-23 19:27:05 (GMT)
commitbe2fc7dcd1720590e9970edc6c74a48329fccbc2 (patch)
tree2d9be408e9d982356095eb64cac1d5edaafd3d63 /c++/src
parentb178d80be0946e3d332ecf575b2f145837cc9454 (diff)
parent2b0fb7e3f1f7da5b23d430702493ed4fb7f87166 (diff)
downloadhdf5-be2fc7dcd1720590e9970edc6c74a48329fccbc2.zip
hdf5-be2fc7dcd1720590e9970edc6c74a48329fccbc2.tar.gz
hdf5-be2fc7dcd1720590e9970edc6c74a48329fccbc2.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2b0fb7e3f1f7da5b23d430702493ed4fb7f87166': (21 commits) HDFFV-9739 only executes H5E tests in production Remove link flag from compile command fix typo Add release note Correct attribute location HDFFV-9739 fix copy testfiles command HDFFV-9739 remove obsolete test files HDFFV-9739 dup test file for concurrent tests HDFFV-9739 Fix autotools script HDFFV-9739 Change autotools test scripts Fix typo HDFFV-9739 Update test reference Update current windows test machines HDFFV-9739 Grab err number before API call HDFFV-9739 Add release note Adjust test names for concurrent tests Fix soversion HDFFV-9739 Fix copy name HDFFV-9739 factor out tests into separate JUnit Updated the threadsafety test to use error macros instead of asserts. ...
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/CMakeLists.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index cf7a8a5..27b71b0 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -84,7 +84,7 @@ set (CPP_HDRS
add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS})
target_include_directories(${HDF5_CPP_LIB_TARGET}
- PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR}"
+ PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_definitions(${HDF5_CPP_LIB_TARGET}
@@ -100,7 +100,7 @@ set (install_targets ${HDF5_CPP_LIB_TARGET})
if (BUILD_SHARED_LIBS)
add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS})
target_include_directories(${HDF5_CPP_LIBSH_TARGET}
- PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR}"
+ PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
target_compile_definitions(${HDF5_CPP_LIBSH_TARGET}