diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:52:09 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2020-04-07 14:52:09 (GMT) |
| commit | f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13 (patch) | |
| tree | a7156065baf87070e6847e282e5fad54d10549a6 /src | |
| parent | e3c71c40a70de46c6cdc2e0d06c08da9c2f95ff2 (diff) | |
| download | hdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.zip hdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.tar.gz hdf5-f502d9f7fbab50f167bcd8bbf02a4f86c7bd8c13.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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 664eb2d..3ed9f99 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1075,9 +1075,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_LIB_TARGET} - PRIVATE "${HDF5_CMAKE_C_FLAGS}" - ) + target_compile_options(${HDF5_LIB_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_compile_definitions(${HDF5_LIB_TARGET} PUBLIC ${HDF_EXTRA_C_FLAGS} @@ -1114,9 +1112,7 @@ if (BUILD_SHARED_LIBS) PUBLIC "$<$<BOOL:${HDF5_ENABLE_HDFS}>:${HDFS_INCLUDE_DIR}>" INTERFACE "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" ) - target_compile_options(${HDF5_LIBSH_TARGET} - PRIVATE "${HDF5_CMAKE_C_FLAGS}" - ) + target_compile_options(${HDF5_LIBSH_TARGET} PRIVATE "${HDF5_CMAKE_C_FLAGS}") target_compile_definitions(${HDF5_LIBSH_TARGET} PUBLIC "H5_BUILT_AS_DYNAMIC_LIB" |