diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 13:53:14 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-05-22 13:53:14 (GMT) |
| commit | f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7 (patch) | |
| tree | 31c2106d670d958e1588ce11f02b65788cb8d000 /config | |
| parent | 73d7f7e7d37b869ce9c39cc8e648ef50d563fc93 (diff) | |
| parent | 926260763940c77cf8f94807823765a3624fa29d (diff) | |
| download | hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.zip hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.tar.gz hdf5-f4c33600ab91e0511898d2bd3a5473aaf7dcd2f7.tar.bz2 | |
Merge pull request #1066 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '926260763940c77cf8f94807823765a3624fa29d':
HDFFV-9739 fix copy testfiles command
HDFFV-9739 remove obsolete test files
HDFFV-9739 dup test file for concurrent tests
HDFFV-9739 Fix autotools script
HDFFV-9739 Change autotools test scripts
Fix typo
HDFFV-9739 Update test reference
Update current windows test machines
HDFFV-9739 Grab err number before API call
HDFFV-9739 Add release note
Adjust test names for concurrent tests
Fix soversion
HDFFV-9739 Fix copy name
HDFFV-9739 factor out tests into separate JUnit
Fix MPI on Windows by adding MPI include folder
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index 2bdf38f..6c203e2 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -20,11 +20,11 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) else () set (LIBHDF_VERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION_MAJOR}) endif () - set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) + set_target_properties (${libtarget} PROPERTIES VERSION ${PACKAGE_SOVERSION}) if (WIN32) - set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${PACKAGE_SOVERSION}") + set (${LIB_OUT_NAME} "${LIB_OUT_NAME}-${LIBHDF_VERSION}") else () - set_target_properties (${libtarget} PROPERTIES SOVERSION ${PACKAGE_SOVERSION}) + set_target_properties (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION}) endif () endif () HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype}) |