diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-03-14 12:14:44 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-03-14 12:14:44 (GMT) |
commit | ff3abc72712dbd677c141c9443a366677ef0b2cf (patch) | |
tree | 1629409be44a3577fb137df75169a3f38eff9412 /config/cmake_ext_mod/HDFMacros.cmake | |
parent | dc858321b60d7a7b4f3ea31b2e96933624c6cd2a (diff) | |
download | hdf5-ff3abc72712dbd677c141c9443a366677ef0b2cf.zip hdf5-ff3abc72712dbd677c141c9443a366677ef0b2cf.tar.gz hdf5-ff3abc72712dbd677c141c9443a366677ef0b2cf.tar.bz2 |
1.8 Update HDF5_ROOT usage (#1488)
Diffstat (limited to 'config/cmake_ext_mod/HDFMacros.cmake')
-rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 6da2b74..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 @@ -427,7 +427,7 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () - if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) + if (NOT ${package_prefix}_EXTERNALLY_CONFIGURED AND CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if (CMAKE_HOST_UNIX) set (CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" CACHE PATH "Install path prefix, prepended onto install directories." FORCE) |