diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-05-14 20:49:47 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-14 20:49:47 (GMT) |
| commit | 343d4775674a5595be42acf35dcabcc0954683a1 (patch) | |
| tree | 2f63cf87dce6146ec6d8d86f2b0bf07878c1a130 | |
| parent | 0b43a038da8d67c032bc580ce0c6c8b4bd3e9a15 (diff) | |
| download | hdf5-343d4775674a5595be42acf35dcabcc0954683a1.zip hdf5-343d4775674a5595be42acf35dcabcc0954683a1.tar.gz hdf5-343d4775674a5595be42acf35dcabcc0954683a1.tar.bz2 | |
Use windows ENV var for default install dir setting #1763 (#1769)
| -rw-r--r-- | config/cmake/HDF518_Examples.cmake.in | 2 | ||||
| -rwxr-xr-x | config/cmake/scripts/HDF5config.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDF518_Examples.cmake.in b/config/cmake/HDF518_Examples.cmake.in index 05bb3a7..0fd3188 100644 --- a/config/cmake/HDF518_Examples.cmake.in +++ b/config/cmake/HDF518_Examples.cmake.in @@ -52,7 +52,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${ if(NOT DEFINED INSTALLDIR) if(WIN32) - set(INSTALLDIR "C:/Program Files/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@") + set(INSTALLDIR "%ProgramFiles%/HDF_Group/@HDF5_PACKAGE_NAME@/@HDF5_PACKAGE_VERSION@") else() set(INSTALLDIR "@CMAKE_INSTALL_PREFIX@") endif() diff --git a/config/cmake/scripts/HDF5config.cmake b/config/cmake/scripts/HDF5config.cmake index 21fbbfa..cc07246 100755 --- a/config/cmake/scripts/HDF5config.cmake +++ b/config/cmake/scripts/HDF5config.cmake @@ -79,7 +79,7 @@ set (CTEST_CONFIGURATION_TYPE "$ENV{CMAKE_CONFIG_TYPE}") if (NOT DEFINED INSTALLDIR) if (WIN32) - set (INSTALLDIR "C:/Program Files/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}") + set (INSTALLDIR "%ProgramFiles%/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}") else () set (INSTALLDIR "${CTEST_SCRIPT_DIRECTORY}/HDF_Group/HDF5/${CTEST_SOURCE_VERSION}") endif () |