summaryrefslogtreecommitdiffstats
path: root/config/cmake/CTestScript.cmake
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2019-11-18 20:58:06 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2019-11-18 20:58:06 (GMT)
commit265325fb9aa5dd6e8ca95fecb52528d7f8702c7d (patch)
tree4b82bbc1051ec687d0cf17d7d6a6c55144d4c475 /config/cmake/CTestScript.cmake
parent3f9c7efbd9a2e8a25266868783cd7665b810017c (diff)
downloadhdf5-265325fb9aa5dd6e8ca95fecb52528d7f8702c7d.zip
hdf5-265325fb9aa5dd6e8ca95fecb52528d7f8702c7d.tar.gz
hdf5-265325fb9aa5dd6e8ca95fecb52528d7f8702c7d.tar.bz2
Add VS2019 support
Diffstat (limited to 'config/cmake/CTestScript.cmake')
-rw-r--r--config/cmake/CTestScript.cmake6
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}\""
)
#-----------------------------------------------------------------------------