diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-03-11 19:29:32 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-11 19:29:32 (GMT) |
| commit | 6f1f02a5b18f56923c66d579057d91a1778e4074 (patch) | |
| tree | 6332340522121182d8c2147a312bb19cb3ba7595 | |
| parent | 9db509762220d661904b5b902aea25cdfaf07b4c (diff) | |
| download | hdf5-6f1f02a5b18f56923c66d579057d91a1778e4074.zip hdf5-6f1f02a5b18f56923c66d579057d91a1778e4074.tar.gz hdf5-6f1f02a5b18f56923c66d579057d91a1778e4074.tar.bz2 | |
1.12 Update HDF5_ROOT usage (#1486)
* Update HDF5_ROOT usage
* Fix typo
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 2 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 11 | ||||
| -rw-r--r-- | release_docs/USING_HDF5_CMake.txt | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index d25e97a..53e9f8f 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -356,7 +356,7 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () if (NOT ${package_prefix}_INSTALL_CMAKE_DIR) - set (${package_prefix}_INSTALL_CMAKE_DIR share/cmake) + set (${package_prefix}_INSTALL_CMAKE_DIR cmake) endif () # Always use full RPATH, i.e. don't skip the full RPATH for the build tree diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 434a704..42527a2 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -288,6 +288,17 @@ Bug Fixes since HDF5-1.12.1 release Configuration ------------- + - Reworked corrected path searched by CMake find_package command + + The install path for cmake find_package files had been changed to use + "share/cmake" + for all platforms. However setting the HDF5_ROOT variable failed to locate + the configuration files. The build variable HDF5_INSTALL_CMAKE_DIR is now + set to the <INSTALL_DIR>/cmake folder. The location of the configuration + files can still be specified by the "HDF5_DIR" variable. + + (ADB - 2022/03/11) + - Corrected path searched by CMake find_package command The install path for cmake find_package files had been changed to use diff --git a/release_docs/USING_HDF5_CMake.txt b/release_docs/USING_HDF5_CMake.txt index 5657d52..9bfc2ca 100644 --- a/release_docs/USING_HDF5_CMake.txt +++ b/release_docs/USING_HDF5_CMake.txt @@ -50,9 +50,9 @@ I. Preconditions or environment variable, set(ENV{HDF5_ROOT} "<install_path>") to the installed location of HDF5. On Windows: - HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.12.x/cmake + HDF5_ROOT=C:/Program Files/HDF_Group/HDF5/1.12.x/ On unix: - HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.12.x/cmake + HDF5_ROOT=<install root folder>/HDF_Group/HDF5/1.12.x/ If you are using shared libraries, you may need to add to the path environment variable. Set the path environment variable to the |