summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-04-07 14:54:20 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-04-07 14:54:20 (GMT)
commit8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd (patch)
tree49545eeb27ea6e18e5bbacb627708b6916d806ab /c++/src
parent9f2f5b2626dfb1f83d7361296a80e496a40633ab (diff)
downloadhdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.zip
hdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.tar.gz
hdf5-8d2de5906b4257f44c08f22cfecafb8ff3a2a9dd.tar.bz2
TRILAB-192 - merge changes from develop
Single source, config files, for warnings for both autotools and CMake. Update CMake libraries, tools, tests to use correct flags.
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index f5a52e7..0b2aeed 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -92,9 +92,7 @@ if (NOT ONLY_SHARED_LIBS)
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
- target_compile_options(${HDF5_CPP_LIB_TARGET}
- PRIVATE "${HDF5_CMAKE_CXX_FLAGS}"
- )
+ target_compile_options(${HDF5_CPP_LIB_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
target_compile_definitions(${HDF5_CPP_LIB_TARGET}
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
)
@@ -112,9 +110,7 @@ if (BUILD_SHARED_LIBS)
PRIVATE "${HDF5_SRC_DIR};${HDF5_BINARY_DIR};$<$<BOOL:${HDF5_ENABLE_PARALLEL}>:${MPI_C_INCLUDE_DIRS}>"
INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>"
)
- target_compile_options(${HDF5_CPP_LIBSH_TARGET}
- PRIVATE "${HDF5_CMAKE_CXX_FLAGS}"
- )
+ target_compile_options(${HDF5_CPP_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_CXX_FLAGS}")
target_compile_definitions(${HDF5_CPP_LIBSH_TARGET}
PUBLIC "H5_BUILT_AS_DYNAMIC_LIB"
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings