diff options
| author | hdftest <hdftest@hdfgroup.org> | 2018-01-06 22:56:57 (GMT) |
|---|---|---|
| committer | hdftest <hdftest@hdfgroup.org> | 2018-01-06 22:56:57 (GMT) |
| commit | 7efa31d45e4dc03f17f28f0e8a21aeeabd213e86 (patch) | |
| tree | 732ec2124dd94ac76cc4cd4efa245208ba4a4057 /c++ | |
| parent | 2f7e94c9c0adb957144f2310f9d4113902a31d34 (diff) | |
| parent | efa2a470c9d8cf2d584f6b22f5b80cd6687887d0 (diff) | |
| download | hdf5-7efa31d45e4dc03f17f28f0e8a21aeeabd213e86.zip hdf5-7efa31d45e4dc03f17f28f0e8a21aeeabd213e86.tar.gz hdf5-7efa31d45e4dc03f17f28f0e8a21aeeabd213e86.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)
* commit 'efa2a470c9d8cf2d584f6b22f5b80cd6687887d0': (36 commits)
Merge fix
HDFFV-9724 1_10 branch has a different number
HDFFV-9724 Merge vds prefix from develop
reverted changes from sync
Snapshot version 1.11 release 1
Fix valgrind issues
HDFFV-9724 init var to null
HDFFV-9724 add valgrind ENV
Fix memory leak due to addition of FORMAT check loop
HDFFV-9724 prefix of 0 length should be null value
HDFFV-9724 Corrected files and verified tests
Add library INTERFACE and MPI to tools
Increase maximum number of retries for h5watch tests.
Revert "Merge pull request #826 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop"
Fix library interface commands, add missing JNI
Add HD prefix
HDFFV-9724 Remove VDS file cache functionality
Removed incorrect MPI text
Par example needs to link with mpi libs
Because of MPI requirements in library ALWAYS add include path
...
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index b147cfa..3b9a0c3 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -82,7 +82,7 @@ set (CPP_HDRS add_library (${HDF5_CPP_LIB_TARGET} STATIC ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIB_TARGET} STATIC " " " ") -target_link_libraries (${HDF5_CPP_LIB_TARGET} ${HDF5_LIB_TARGET}) +target_link_libraries (${HDF5_CPP_LIB_TARGET} PUBLIC ${HDF5_LIB_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIB_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC) set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES @@ -94,7 +94,7 @@ set (install_targets ${HDF5_CPP_LIB_TARGET}) if (BUILD_SHARED_LIBS) add_library (${HDF5_CPP_LIBSH_TARGET} SHARED ${CPP_SOURCES} ${CPP_HDRS}) TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ") - target_link_libraries (${HDF5_CPP_LIBSH_TARGET} ${HDF5_LIBSH_TARGET}) + target_link_libraries (${HDF5_CPP_LIBSH_TARGET} PUBLIC ${HDF5_LIBSH_TARGET}) set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_CPP_LIBSH_TARGET}") H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED ${HDF5_CXX_PACKAGE_SOVERSION}) set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES |