diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-09 18:45:44 (GMT) |
| commit | dcc66a4f157ace0858b788228550f3e104df3242 (patch) | |
| tree | e60eaa27df6d6bc80a32d6a73d329c41c423eb54 /c++ | |
| parent | 7aeebec9463d18c3040ba7fa37464c00b64ab75e (diff) | |
| parent | d6ea76ac002cd8483ba8a6aaf55bbce5ed552937 (diff) | |
| download | hdf5-dcc66a4f157ace0858b788228550f3e104df3242.zip hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.gz hdf5-dcc66a4f157ace0858b788228550f3e104df3242.tar.bz2 | |
Merge pull request #1049 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'd6ea76ac002cd8483ba8a6aaf55bbce5ed552937':
GGC requires attribute before function
Correct COMPILE defs usage
Add missing module_dir property
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | c++/test/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 8226d16..cf7a8a5 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -88,7 +88,7 @@ target_include_directories(${HDF5_CPP_LIB_TARGET} INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) target_compile_definitions(${HDF5_CPP_LIB_TARGET} - PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:"-DMPICH_SKIP_MPICXX;-DMPICH_IGNORE_CXX_SEEK"># Parallel/MPI, prevent spurious cpp/cxx warnings + PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings ) TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC) target_link_libraries (${HDF5_CPP_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET}) @@ -105,7 +105,7 @@ if (BUILD_SHARED_LIBS) ) target_compile_definitions(${HDF5_CPP_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB" - PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:"-DMPICH_SKIP_MPICXX;-DMPICH_IGNORE_CXX_SEEK"># Parallel/MPI, prevent spurious cpp/cxx warnings + PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings ) TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED) target_link_libraries (${HDF5_CPP_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) diff --git a/c++/test/CMakeLists.txt b/c++/test/CMakeLists.txt index 0815aa8..33849a9 100644 --- a/c++/test/CMakeLists.txt +++ b/c++/test/CMakeLists.txt @@ -40,7 +40,7 @@ configure_file (${HDF5_CPP_TEST_SOURCE_DIR}/H5srcdir_str.h.in H5srcdir_str.h @O add_executable (cpp_testhdf5 ${CPP_TEST_SOURCES} ) target_include_directories(cpp_testhdf5 PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};${HDF5_TEST_BINARY_DIR}") target_compile_definitions(cpp_testhdf5 - PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:"-DMPICH_SKIP_MPICXX;-DMPICH_IGNORE_CXX_SEEK"># Parallel/MPI, prevent spurious cpp/cxx warnings + PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings ) TARGET_C_PROPERTIES (cpp_testhdf5 STATIC) target_link_libraries (cpp_testhdf5 PRIVATE |