diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2020-12-16 17:59:51 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-16 17:59:51 (GMT) |
| commit | faf3a2fae0c0c7afdc184c61abc918a03e916f68 (patch) | |
| tree | e6c8b3eef6e2e7093c7baa5f65f7e47361c994c9 /config/cmake_ext_mod | |
| parent | affbead81a20712920bfe350eb90b0a4bb754ebf (diff) | |
| download | hdf5-faf3a2fae0c0c7afdc184c61abc918a03e916f68.zip hdf5-faf3a2fae0c0c7afdc184c61abc918a03e916f68.tar.gz hdf5-faf3a2fae0c0c7afdc184c61abc918a03e916f68.tar.bz2 | |
OESS-98 convert plugin option to FetchContent, add tests (#155)
* OESS-98 convert plugin option to FetchContent, add tests
* Fixes for pkcfg files because of plugin option
* Update other test machines
* OESS-98 fix tools test for plugins
* HDFFV-10865 performance improvement for java array
Diffstat (limited to 'config/cmake_ext_mod')
| -rw-r--r-- | config/cmake_ext_mod/HDFMacros.cmake | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/config/cmake_ext_mod/HDFMacros.cmake b/config/cmake_ext_mod/HDFMacros.cmake index 8ca8159..952b766 100644 --- a/config/cmake_ext_mod/HDFMacros.cmake +++ b/config/cmake_ext_mod/HDFMacros.cmake @@ -429,6 +429,19 @@ macro (HDF_DIR_PATHS package_prefix) endif () endif () + if (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) + else () + GetDefaultWindowsPrefixBase(CMAKE_GENERIC_PROGRAM_FILES) + set (CMAKE_INSTALL_PREFIX + "${CMAKE_GENERIC_PROGRAM_FILES}/HDF_Group/${HDF5_PACKAGE_NAME}/${HDF5_PACKAGE_VERSION}" + CACHE PATH "Install path prefix, prepended onto install directories." FORCE) + set (CMAKE_GENERIC_PROGRAM_FILES) + endif () + endif () + #----------------------------------------------------------------------------- # Setup pre-3.14 FetchContent #----------------------------------------------------------------------------- |