summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-12-22 14:35:12 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-12-22 14:35:28 (GMT)
commitb00388a7e72389234b1bf203823dea5f0f33b559 (patch)
tree333a615ed55909c86e8bf19ab0b0e4b64f80b969
parenta2752fd914fec369c7961b76ab9cc30f1727a017 (diff)
parent85a07b4b49a88facc04035cb9f4b30f5c4ee28ac (diff)
downloadCMake-b00388a7e72389234b1bf203823dea5f0f33b559.zip
CMake-b00388a7e72389234b1bf203823dea5f0f33b559.tar.gz
CMake-b00388a7e72389234b1bf203823dea5f0f33b559.tar.bz2
Merge topic 'ci-windows-no-java' into release-3.22
85a07b4b49 ci: Explicitly disable Java tests on VS builds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !6826
-rw-r--r--.gitlab/ci/configure_windows_vs2022_x64.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitlab/ci/configure_windows_vs2022_x64.cmake b/.gitlab/ci/configure_windows_vs2022_x64.cmake
index f6ece57..7c024a8 100644
--- a/.gitlab/ci/configure_windows_vs2022_x64.cmake
+++ b/.gitlab/ci/configure_windows_vs2022_x64.cmake
@@ -1,3 +1,4 @@
set(CMake_TEST_WIX_NO_VERIFY "ON" CACHE BOOL "")
+set(CMake_TEST_Java OFF CACHE BOOL "")
include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake")