diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-05-13 23:32:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-05-13 23:32:28 (GMT) |
| commit | 47fb7b8bc7da7db75e11f1234465fae7fac6827e (patch) | |
| tree | 5d80189cab23219b2d964e4d747ae5146418a495 | |
| parent | 436d6910ec95e4f0191387931b1ca01ff29aff85 (diff) | |
| download | hdf5-47fb7b8bc7da7db75e11f1234465fae7fac6827e.zip hdf5-47fb7b8bc7da7db75e11f1234465fae7fac6827e.tar.gz hdf5-47fb7b8bc7da7db75e11f1234465fae7fac6827e.tar.bz2 | |
Use windows ENV var for default install dir setting #1763 (#1768)
| -rw-r--r-- | config/cmake/HDF5_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/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in index 0e7f9f0..be69e64 100644 --- a/config/cmake/HDF5_Examples.cmake.in +++ b/config/cmake/HDF5_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 7a8d472..698516c 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 () |