diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-04-10 15:52:18 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-04-10 15:52:18 (GMT) |
| commit | df83d7813466fcb38b344361960681354a54af2a (patch) | |
| tree | 8a201de5c0f44e9d2ac3404adbea0a590bc32621 /config/cmake | |
| parent | 744d2d3d8c5660dd9758c74cf9d3c76bc172cdf3 (diff) | |
| download | hdf5-df83d7813466fcb38b344361960681354a54af2a.zip hdf5-df83d7813466fcb38b344361960681354a54af2a.tar.gz hdf5-df83d7813466fcb38b344361960681354a54af2a.tar.bz2 | |
HDFFV-10444 fix so numbers and merge java test changes
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/HDF5Macros.cmake | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake index c3dea9a..e472a67 100644 --- a/config/cmake/HDF5Macros.cmake +++ b/config/cmake/HDF5Macros.cmake @@ -10,19 +10,15 @@ # help@hdfgroup.org. # #------------------------------------------------------------------------------- -macro (H5_SET_LIB_OPTIONS libtarget libname libtype) +macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage) set (LIB_OUT_NAME "${libname}") # SOVERSION passed in ARGN when shared if (${libtype} MATCHES "SHARED") - if (ARGN) - set (PACKAGE_SOVERSION ${ARGN}) - else () - set (PACKAGE_SOVERSION ${H5_SOVERS_MAJOR}) - endif () + set (PACKAGE_SOVERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION}) if (WIN32) set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR}) else () - set (LIBHDF_VERSION ${HDF5_PACKAGE_SOVERSION}) + set (LIBHDF_VERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION_MAJOR}) endif () set_target_properties (${libtarget} PROPERTIES VERSION ${LIBHDF_VERSION}) if (WIN32) |