From 39dcc7488159e6812292ecbd15a1ed25ade493a2 Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Mon, 18 Jul 2022 05:42:50 -0700 Subject: ci: Add VS2022 and MSBuild to Windows CI runners (#1108) --- ci/build | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'ci') diff --git a/ci/build b/ci/build index ff50bbfb..648bf4c2 100755 --- a/ci/build +++ b/ci/build @@ -17,7 +17,16 @@ else mkdir -p ${BUILDDIR:-build} cd ${BUILDDIR:-build} ${CMAKE_PREFIX:-} cmake ${CMAKE_PARAMS:-} ${CCACHE_LOC:-..} - ${CMAKE_PREFIX:-} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS:-} -- -j$JOBS + + case "${CMAKE_GENERATOR}" in + [Vv]isual" "[Ss]tudio*) # MSBuild, use all CPUs. + ${CMAKE_PREFIX:-} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS:-} -- -m + ;; + *) # Ninja automatically uses all available CPUs. + ${CMAKE_PREFIX:-} cmake --build . ${EXTRA_CMAKE_BUILD_FLAGS:-} + ;; + esac + case "${RUN_TESTS:-all}" in all) CC=${TEST_CC:-${CC}} ctest --output-on-failure -j$JOBS "$@" -- cgit v1.2.1