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 /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 'src')
| -rw-r--r-- | src/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8177835..4d2f1bc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -703,7 +703,7 @@ if (NOT WIN32) target_link_libraries (${HDF5_LIB_TARGET} PUBLIC ${CMAKE_DL_LIBS}) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT ${HDF5_LIB_TARGET}) -H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC) +H5_SET_LIB_OPTIONS (${HDF5_LIB_TARGET} ${HDF5_LIB_NAME} STATIC 0) set_target_properties (${HDF5_LIB_TARGET} PROPERTIES FOLDER libraries INTERFACE_INCLUDE_DIRECTORIES "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/include>" @@ -726,7 +726,7 @@ if (BUILD_SHARED_LIBS) target_link_libraries (${HDF5_LIBSH_TARGET} PUBLIC ${CMAKE_DL_LIBS}) endif () set_global_variable (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_LIBSH_TARGET}") - H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED ${HDF5_PACKAGE_SOVERSION}) + H5_SET_LIB_OPTIONS (${HDF5_LIBSH_TARGET} ${HDF5_LIB_NAME} SHARED "LIB") set_target_properties (${HDF5_LIBSH_TARGET} PROPERTIES FOLDER libraries COMPILE_DEFINITIONS "H5_BUILT_AS_DYNAMIC_LIB" |