diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-04-12 23:38:47 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-04-12 23:38:47 (GMT) |
| commit | c1e82e516fb6c8c7fe40be385ef09dd5502205f0 (patch) | |
| tree | a3a44a02a0db7d11c251a9769507ee91f0ae2722 /c++/src | |
| parent | 8b15b10c59b73cdc624cacbfe7652f32c3d44dae (diff) | |
| parent | 27ef4b154615496ff2b383636842c646d1269044 (diff) | |
| download | hdf5-c1e82e516fb6c8c7fe40be385ef09dd5502205f0.zip hdf5-c1e82e516fb6c8c7fe40be385ef09dd5502205f0.tar.gz hdf5-c1e82e516fb6c8c7fe40be385ef09dd5502205f0.tar.bz2 | |
Merge branch 'hdf5_1_8' of https://bitbucket.hdfgroup.org/scm/~bmribler/hdf5_1_8_bmr into hdf5_1_8
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 4e36521..5b36137 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -84,7 +84,7 @@ 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} 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) +H5_SET_LIB_OPTIONS (${HDF5_CPP_LIB_TARGET} ${HDF5_CPP_LIB_NAME} STATIC 0) set_target_properties (${HDF5_CPP_LIB_TARGET} PROPERTIES FOLDER libraries/cpp INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" @@ -96,7 +96,7 @@ if (BUILD_SHARED_LIBS) TARGET_C_PROPERTIES (${HDF5_CPP_LIBSH_TARGET} SHARED " " " ") 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}) + H5_SET_LIB_OPTIONS (${HDF5_CPP_LIBSH_TARGET} ${HDF5_CPP_LIB_NAME} SHARED "CXX") set_target_properties (${HDF5_CPP_LIBSH_TARGET} PROPERTIES FOLDER libraries/cpp COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB" |