HDFFV-10685 Always set version flags on OSX

2 files changed, 25 insertions, 14 deletions

diff --git a/config/cmake/HDF5Macros.cmake b/config/cmake/HDF5Macros.cmake
index 6c203e2..007bc29 100644
--- a/config/cmake/HDF5Macros.cmake
+++ b/config/cmake/HDF5Macros.cmake
@@ -15,6 +15,8 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
   # SOVERSION passed in ARGN when shared
   if (${libtype} MATCHES "SHARED")
     set (PACKAGE_SOVERSION ${HDF5_${libpackage}_PACKAGE_SOVERSION})
+    set (PACKAGE_COMPATIBILITY ${H5_${libpackage}_SOVERS_INTERFACE}.0.0)
+    set (PACKAGE_CURRENT ${H5_${libpackage}_SOVERS_INTERFACE}.${H5_${libpackage}_SOVERS_MINOR}.0)
     if (WIN32)
       set (LIBHDF_VERSION ${HDF5_PACKAGE_VERSION_MAJOR})
     else ()
@@ -26,6 +28,11 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
     else ()
         set_target_properties (${libtarget} PROPERTIES SOVERSION ${LIBHDF_VERSION})
     endif ()
+    if (CMAKE_C_OSX_CURRENT_VERSION_FLAG)
+      set_property(TARGET ${libtarget} APPEND PROPERTY
+          LINK_FLAGS "${CMAKE_C_OSX_CURRENT_VERSION_FLAG}${PACKAGE_CURRENT} ${CMAKE_C_OSX_COMPATIBILITY_VERSION_FLAG}${PACKAGE_COMPATIBILITY}"
+      )
+    endif ()
   endif ()
   HDF_SET_LIB_OPTIONS (${libtarget} ${LIB_OUT_NAME} ${libtype})
 
@@ -33,9 +40,6 @@ macro (H5_SET_LIB_OPTIONS libtarget libname libtype libpackage)
   if (APPLE)
     option (HDF5_BUILD_WITH_INSTALL_NAME "Build with library install_name set to the installation path" OFF)
     if (HDF5_BUILD_WITH_INSTALL_NAME)
-      set_property(TARGET ${libtarget} APPEND PROPERTY
-          LINK_FLAGS "-current_version ${HDF5_PACKAGE_VERSION} -compatibility_version ${HDF5_PACKAGE_VERSION}"
-      )
       set_target_properties (${libtarget} PROPERTIES
           INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib"
           BUILD_WITH_INSTALL_RPATH ${HDF5_BUILD_WITH_INSTALL_NAME}
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e4a39c9..d40e59a 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -47,6 +47,13 @@ New Features
 
     Configuration:
     -------------
+    - Rework CMake versioning for OSX platforms.
+
+      Changed the current_version and compatibility_version flags from optional
+      with HDF5_BUILD_WITH_INSTALL_NAME to always setting the flags for OSX.
+
+      (ADB - 2019/01/22, HDFFV-10685)
+
     - Rework CMake command files to eliminate developer CMP005 warning
 
       Use variables without quotes in if () statements.
@@ -203,8 +210,8 @@ New Features
     - Changed the default behavior in parallel when reading the same dataset in its entirely
       (i.e. H5S_ALL dataset selection) which is being read by all the processes collectively.
       The dataset mush be contiguous, less than 2GB, and of an atomic datatype.
-      The new behavior is the HDF5 library will use an MPI_Bcast to pass the data read from 
-      the disk by the root process to the remain processes in the MPI communicator associated 
+      The new behavior is the HDF5 library will use an MPI_Bcast to pass the data read from
+      the disk by the root process to the remain processes in the MPI communicator associated
       with the HDF5 file.
 
       (MSB - 2019/01/02, HDFFV-10652)
@@ -231,10 +238,10 @@ New Features
 
     - Added new Fortran API, H5gmtime, which converts (C) 'time_t' structure
       to Fortran DATE AND TIME storage format.
-      
+
       (MSB, 2019/01/08, HDFFV-10443)
 
-    - Added new Fortran 'fields' optional parameter to: h5ovisit_f, h5oget_info_by_name_f, 
+    - Added new Fortran 'fields' optional parameter to: h5ovisit_f, h5oget_info_by_name_f,
       h5oget_info, h5oget_info_by_idx and h5ovisit_by_name_f.
 
       (MSB, 2019/01/08, HDFFV-10443)
@@ -318,8 +325,8 @@ Bug Fixes since HDF5-1.10.3 release
 
       When deleting the attribute nodes from the name index v2 B-tree,
       if an attribute is found in the intermediate B-tree nodes,
-      which may be merged/redistributed in the process, we need to 
-      free the dynamically allocated spaces for the intermediate 
+      which may be merged/redistributed in the process, we need to
+      free the dynamically allocated spaces for the intermediate
       decoded attribute.
 
       (VC - 2018/12/26, HDFFV-10659)
@@ -408,10 +415,10 @@ Bug Fixes since HDF5-1.10.3 release
     Fortran
     --------
     - Added symbolic links libhdf5_hl_fortran.so to libhdf5hl_fortran.so and
-      libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for 
-      autotools installs.  These were added to match the name of the files 
-      installed by cmake and the general pattern of hl lib files.  We will 
-      change the names of the installed lib files to the matching name in 
+      libhdf5_hl_fortran.a to libhdf5hl_fortran.a in hdf5/lib directory for
+      autotools installs.  These were added to match the name of the files
+      installed by cmake and the general pattern of hl lib files.  We will
+      change the names of the installed lib files to the matching name in
       the next major release.
 
       (LRK - 2019/01/04, HDFFV-10596)
@@ -422,7 +429,7 @@ Bug Fixes since HDF5-1.10.3 release
 
       (MSB, 2018/12/04, HDFFV-10511)
 
-    - Fixed issue with Fortran not returning h5o_info_t field values 
+    - Fixed issue with Fortran not returning h5o_info_t field values
       meta_size%attr%index_size and  meta_size%attr%heap_size.
 
       (MSB, 2018/1/8, HDFFV-10443)