diff options
author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:42:21 (GMT) |
---|---|---|
committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:42:21 (GMT) |
commit | ec145b88fa2adcb87483864a5a8296eda9223577 (patch) | |
tree | f7116b7d8ae37d903f9ad4262c8ac44aa525680d /config/cmake/CTestScript.cmake | |
parent | 7200bce6462f023130edc6344333eb0d79cde7fc (diff) | |
download | hdf5-ec145b88fa2adcb87483864a5a8296eda9223577.zip hdf5-ec145b88fa2adcb87483864a5a8296eda9223577.tar.gz hdf5-ec145b88fa2adcb87483864a5a8296eda9223577.tar.bz2 |
HDFFV-10962 add VS2019 support
Diffstat (limited to 'config/cmake/CTestScript.cmake')
-rwxr-xr-x | config/cmake/CTestScript.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/cmake/CTestScript.cmake b/config/cmake/CTestScript.cmake index e819e58..e914c4d 100755 --- a/config/cmake/CTestScript.cmake +++ b/config/cmake/CTestScript.cmake @@ -119,8 +119,12 @@ set(CTEST_CONFIGURE_TOOLSET "") if(CMAKE_GENERATOR_TOOLSET) set(CTEST_CONFIGURE_TOOLSET "-T${CMAKE_GENERATOR_TOOLSET}") endif() +set(CTEST_CONFIGURE_ARCHITECTURE "") +if(CMAKE_GENERATOR_ARCHITECTURE) + set(CTEST_CONFIGURE_ARCHITECTURE "-A${CMAKE_GENERATOR_ARCHITECTURE}") +endif() set (CTEST_CONFIGURE_COMMAND - "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\"" + "${CTEST_CMAKE_COMMAND} -C \"${CTEST_SOURCE_DIRECTORY}/config/cmake/cacheinit.cmake\" -DCMAKE_BUILD_TYPE:STRING=${CTEST_CONFIGURATION_TYPE} ${BUILD_OPTIONS} \"-G${CTEST_CMAKE_GENERATOR}\" \"${CTEST_CONFIGURE_ARCHITECTURE}\" \"${CTEST_CONFIGURE_TOOLSET}\" \"${CTEST_SOURCE_DIRECTORY}\"" ) #----------------------------------------------------------------------------- |