diff options
| author | Vailin Choi <vchoi@hdfgroup.org> | 2018-05-23 19:27:05 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@hdfgroup.org> | 2018-05-23 19:27:05 (GMT) |
| commit | be2fc7dcd1720590e9970edc6c74a48329fccbc2 (patch) | |
| tree | 2d9be408e9d982356095eb64cac1d5edaafd3d63 /hl/src | |
| parent | b178d80be0946e3d332ecf575b2f145837cc9454 (diff) | |
| parent | 2b0fb7e3f1f7da5b23d430702493ed4fb7f87166 (diff) | |
| download | hdf5-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 'hl/src')
| -rw-r--r-- | hl/src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/src/CMakeLists.txt b/hl/src/CMakeLists.txt index aa33e59..e339f11 100644 --- a/hl/src/CMakeLists.txt +++ b/hl/src/CMakeLists.txt @@ -31,7 +31,7 @@ set (HL_HEADERS add_library (${HDF5_HL_LIB_TARGET} STATIC ${HL_SOURCES} ${HL_HEADERS}) target_include_directories(${HDF5_HL_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_C_PROPERTIES (${HDF5_HL_LIB_TARGET} STATIC) @@ -44,7 +44,7 @@ set (install_targets ${HDF5_HL_LIB_TARGET}) if (BUILD_SHARED_LIBS) add_library (${HDF5_HL_LIBSH_TARGET} SHARED ${HL_SOURCES} ${HL_HEADERS}) target_include_directories(${HDF5_HL_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_HL_LIBSH_TARGET} |