diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-12-28 22:27:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-12-28 22:27:39 (GMT) |
| commit | f4d5f2ee10f3bcc86e74c0bb0f3527b13fbd2d17 (patch) | |
| tree | 3083ec710691b9353e9aee5e2ad7095ca8701890 /c++/src | |
| parent | a608cd4e09213433ec7799777da4a0a98a03ed42 (diff) | |
| parent | ef2ac0784508083ac057586feb6ad9bbdd98e5bd (diff) | |
| download | hdf5-f4d5f2ee10f3bcc86e74c0bb0f3527b13fbd2d17.zip hdf5-f4d5f2ee10f3bcc86e74c0bb0f3527b13fbd2d17.tar.gz hdf5-f4d5f2ee10f3bcc86e74c0bb0f3527b13fbd2d17.tar.bz2 | |
Merge pull request #831 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit 'ef2ac0784508083ac057586feb6ad9bbdd98e5bd':
Update link target commands
Skip test if 1.6 API enabled
Reworked MPI includes to be used as default with parallel
Update with latest from CMake master
HDFFV-10307 Add HDtupper() call for Windows drive
H5detect and make_libsettings need the include folder
Test increase of version
Diffstat (limited to 'c++/src')
| -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 579ef64..82ece33 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_SRCS} ${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_SRCS} ${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 |