Remove OPTION as appending to the list will not overwrite

CMakePresets.json

@@ -122,7 +122,6 @@
         "HDF5_BUILD_GENERATORS": "ON",
         "HDF5_ENABLE_ALL_WARNINGS": "ON",
         "HDF5_MINGW_STATIC_GCC_LIBS": "ON",
-        "HDF5_APPEND_DEFAULT_RPATH": "ON",
         "HDF_TEST_EXPRESS": "2"
       }
     },

config/cmake/HDFMacros.cmake

@@ -458,19 +458,16 @@ macro (HDF_DIR_PATHS package_prefix)
   endif ()
   message(STATUS "Final: ${${package_prefix}_INSTALL_DOC_DIR}")
 
-  # Define the needed INSTALL_RPATH for HDF Standard binary packages
-  option (HDF5_APPEND_DEFAULT_RPATH "Append to the default RPATH for the HDF installation" OFF)
-  if (HDF5_APPEND_DEFAULT_RPATH)
-    if (APPLE)
-      list(APPEND CMAKE_INSTALL_RPATH
-          "@executable_path/../${${package_prefix}_INSTALL_LIB_DIR}"
-          "@executable_path/"
-          "@loader_path/../${${package_prefix}_INSTALL_LIB_DIR}"
-          "@loader_path/"
-      )
-    else ()
-      list(APPEND CMAKE_INSTALL_RPATH "\$ORIGIN/../${${package_prefix}_INSTALL_LIB_DIR}:\$ORIGIN/")
-    endif ()
+  # Append the needed INSTALL_RPATH for HDF Standard binary packages
+  if (APPLE)
+    list(APPEND CMAKE_INSTALL_RPATH
+        "@executable_path/../${${package_prefix}_INSTALL_LIB_DIR}"
+        "@executable_path/"
+        "@loader_path/../${${package_prefix}_INSTALL_LIB_DIR}"
+        "@loader_path/"
+    )
+  else ()
+    list(APPEND CMAKE_INSTALL_RPATH "\$ORIGIN/../${${package_prefix}_INSTALL_LIB_DIR}:\$ORIGIN/")
   endif ()
 
   if (DEFINED ADDITIONAL_CMAKE_PREFIX_PATH AND EXISTS "${ADDITIONAL_CMAKE_PREFIX_PATH}")

config/cmake/cacheinit.cmake

@@ -43,8 +43,6 @@ set (HDF5_MINGW_STATIC_GCC_LIBS ON CACHE BOOL "Statically link libgcc/libstdc++"
 set (HDF5_ALLOW_EXTERNAL_SUPPORT "TGZ" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
 set_property (CACHE HDF5_ALLOW_EXTERNAL_SUPPORT PROPERTY STRINGS NO GIT TGZ)
 
-set (HDF5_APPEND_DEFAULT_RPATH ON "Append to the default RPATH for the HDF installation" FORCE)
-
 ########################
 # compression options
 ########################

release_docs/INSTALL_CMake.txt

@@ -538,7 +538,6 @@ These five steps are described in detail below.
             set (HDF5_BUILD_JAVA ON CACHE BOOL "Build JAVA support" FORCE)
             set (HDF5_ENABLE_ALL_WARNINGS ON CACHE BOOL "Enable all warnings" FORCE)
             set (HDF5_ALLOW_EXTERNAL_SUPPORT "TGZ" CACHE STRING "Allow External Library Building (NO GIT TGZ)" FORCE)
-            set (HDF5_APPEND_DEFAULT_RPATH ON "Append to the default RPATH for the HDF installation" FORCE)
             ########################
             # compression options
             ########################
@@ -755,8 +754,7 @@ BUILD_STATIC_LIBS  "Build Static Libraries"         ON
 BUILD_STATIC_EXECS "Build Static Executables"       OFF
 BUILD_TESTING      "Build HDF5 Unit Testing"        ON
 if (WINDOWS)
-  HDF5_DISABLE_PDB_FILES  "Do not install PDB files" OFF
-HDF5_APPEND_DEFAULT_RPATH "Append to the default RPATH for the HDF installation" OFF
+  HDF5_DISABLE_PDB_FILES "Do not install PDB files" OFF
 
 ---------------- HDF5 Build Options ----------------------------------------
 HDF5_BUILD_CPP_LIB        "Build HDF5 C++ Library"              OFF

release_docs/RELEASE.txt

@@ -565,12 +565,11 @@ Bug Fixes since HDF5-2.0.0 release
 
     Configuration
     -------------
-    - The RPATH settings were restored under an HDF5 option
+    - The RPATH settings were restored by appending to the CMAKE_INSTALL_RPATH
 
       The RPATH settings were removed by a pull-request #5271, but the settings are needed
-      under certain conditions. The settings have been restored under the HDF5_APPEND_DEFAULT_RPATH option.
-      The option is OFF by default. Typical builds using either the cacheinit.cmake file or presets
-      will enable the RPATH settings by appending to CMAKE_INSTALL_RPATH.
+      under certain conditions. The settings have been restored by appending the necessary paths
+      and will not override and existing settings.
 
     - Use pre-installed libaec compression library