summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-04-12 16:48:44 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-04-12 16:48:44 (GMT)
commit27ef4b154615496ff2b383636842c646d1269044 (patch)
treebe1af45cd4c165fe4b438d3e8e2808a0b28744ab /src
parent3fc4ea3d3935f254ac61fd726f9b9d684fe653a6 (diff)
parentd87a94a00d09f8b441d02272b06d6866eec4c883 (diff)
downloadhdf5-27ef4b154615496ff2b383636842c646d1269044.zip
hdf5-27ef4b154615496ff2b383636842c646d1269044.tar.gz
hdf5-27ef4b154615496ff2b383636842c646d1269044.tar.bz2
Merge pull request #1026 in HDFFV/hdf5 from ~BYRN/hdf5_adb:hdf5_1_8 to hdf5_1_8
* commit 'd87a94a00d09f8b441d02272b06d6866eec4c883': HDFFV-10444 fix so numbers
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
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"