diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:34:04 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2019-11-18 21:34:04 (GMT) |
| commit | 144e7a600c7db5a5ba23db882d7c1d6f758d82d2 (patch) | |
| tree | f644532d6432befb9f87d5a5a9164dfe1cae5c6a /config/cmake/CTestScript.cmake | |
| parent | d82d2e981acb7506fcc6856f3deab9499bbf5fd6 (diff) | |
| download | hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.zip hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.tar.gz hdf5-144e7a600c7db5a5ba23db882d7c1d6f758d82d2.tar.bz2 | |
HDFFV-10962 add VS2019 support
Diffstat (limited to 'config/cmake/CTestScript.cmake')
| -rw-r--r-- | 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 100644 --- 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}\"" ) #----------------------------------------------------------------------------- |