diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2023-11-11 04:36:06 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-11 04:36:06 (GMT) |
| commit | a6e610eb639f05da58246e1ccaa55cec4f679008 (patch) | |
| tree | ab2d10c5df09ea6f1ac0a321f7c9f597fb88c19d /config/cmake | |
| parent | 5e0b59a70cc093b6ce17820a78de410201867226 (diff) | |
| download | hdf5-a6e610eb639f05da58246e1ccaa55cec4f679008.zip hdf5-a6e610eb639f05da58246e1ccaa55cec4f679008.tar.gz hdf5-a6e610eb639f05da58246e1ccaa55cec4f679008.tar.bz2 | |
Correct ENV variables (#3841)
Diffstat (limited to 'config/cmake')
| -rw-r--r-- | config/cmake/examples/HDF5_Examples.cmake.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/config/cmake/examples/HDF5_Examples.cmake.in b/config/cmake/examples/HDF5_Examples.cmake.in index 2f3a649..9c99719 100644 --- a/config/cmake/examples/HDF5_Examples.cmake.in +++ b/config/cmake/examples/HDF5_Examples.cmake.in @@ -53,7 +53,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCTEST_CONFIGURATION_TYPE:STRING=${ if(NOT DEFINED INSTALLDIR) if(WIN32) - set(INSTALLDIR "%ProgramFiles%/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() @@ -78,6 +78,7 @@ set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DSITE:STRING=${CTEST_SITE} -DBUILDN ############################################################################################################### set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_ROOT:PATH=${INSTALLDIR}") +set (ENV{HDF5_ROOT} "${INSTALLDIR}") if(WIN32) set(SITE_OS_NAME "Windows") set(CTEST_BINARY_NAME ${CTEST_SOURCE_NAME}\\build) @@ -98,11 +99,11 @@ endif() set(ENV{HDF5_PLUGIN_PATH} "${INSTALLDIR}/lib/plugin") set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DHDF5_PACKAGE_NAME:STRING=@HDF5_PACKAGE@@HDF_PACKAGE_EXT@") ### use a toolchain file (supported everywhere) #### -if(NOT DEFINED CTEST_TOOLCHAIN_FILE) - set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CTEST_TOOLCHAIN_FILE@") -else() - set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=${CTEST_TOOLCHAIN_FILE}") -endif() +#if(NOT DEFINED CTEST_TOOLCHAIN_FILE) +# set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=@CTEST_TOOLCHAIN_FILE@") +#else() +# set(ADD_BUILD_OPTIONS "${ADD_BUILD_OPTIONS} -DCMAKE_TOOLCHAIN_FILE:STRING=${CTEST_TOOLCHAIN_FILE}") +#endif() ############################################################################################################### # For any comments please contact cdashhelp@hdfgroup.org |