summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2020-03-30 14:28:05 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2020-03-30 14:28:05 (GMT)
commitac32ce96a35d0d15bcda45779de43345da95959f (patch)
tree8a92efc089bbddb6206a9d6115d6be8dd062de30 /c++
parent490cb6f9cd724ef28529c8c80e73e9b5cbc5df4a (diff)
downloadhdf5-ac32ce96a35d0d15bcda45779de43345da95959f.zip
hdf5-ac32ce96a35d0d15bcda45779de43345da95959f.tar.gz
hdf5-ac32ce96a35d0d15bcda45779de43345da95959f.tar.bz2
TRILAB-192 merging warnings changes from develop
Diffstat (limited to 'c++')
-rw-r--r--c++/src/CMakeLists.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 39f0f3a..fa15c9e 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -90,6 +90,9 @@ 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_definitions(${HDF5_CPP_LIB_TARGET}
PRIVATE $<$<BOOL:${HDF5_ENABLE_PARALLEL}>:MPICH_SKIP_MPICXX;MPICH_IGNORE_CXX_SEEK># Parallel/MPI, prevent spurious cpp/cxx warnings
)
@@ -107,6 +110,9 @@ 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_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