summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorAllen Byrne <50328838+byrnHDF@users.noreply.github.com>2022-05-12 14:03:32 (GMT)
committerGitHub <noreply@github.com>2022-05-12 14:03:32 (GMT)
commitb9dc83934df91a27d16304bb00ac54648c01ef93 (patch)
treeeff9b74b3ebdb7e4991d023702dbce5873297b18 /config
parentd0ea8a1d8cbc5ec54b179f605f90636ee8a837f0 (diff)
downloadhdf5-b9dc83934df91a27d16304bb00ac54648c01ef93.zip
hdf5-b9dc83934df91a27d16304bb00ac54648c01ef93.tar.gz
hdf5-b9dc83934df91a27d16304bb00ac54648c01ef93.tar.bz2
Use windows ENV var for default install dir setting (#1763)
* Use windows ENV var for default install dir setting * Change variable name
Diffstat (limited to 'config')
-rw-r--r--config/cmake/HDF5_Examples.cmake.in2
-rw-r--r--config/cmake/scripts/HDF5config.cmake2
2 files changed, 2 insertions, 2 deletions
diff --git a/config/cmake/HDF5_Examples.cmake.in b/config/cmake/HDF5_Examples.cmake.in
index 795399e..e6e6af2 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 9a3ead2..cbeb830 100644
--- 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 ()