From 4b90688aa0963e35c386a59612c02d605a7f68d0 Mon Sep 17 00:00:00 2001 From: Brad King Date: Mon, 14 Feb 2022 10:11:49 -0500 Subject: ci: Explicitly disable Java tests on Windows with Borland and Open Watcom Extend the change from commit 840fa28d3d (ci: Explicitly disable Java tests on Windows, 2021-12-16) to cover Borland and Open Watcom builds. --- .gitlab/ci/configure_windows_borland_common.cmake | 3 +++ .gitlab/ci/configure_windows_openwatcom_common.cmake | 3 +++ 2 files changed, 6 insertions(+) diff --git a/.gitlab/ci/configure_windows_borland_common.cmake b/.gitlab/ci/configure_windows_borland_common.cmake index 6d66a05..55dce1d 100644 --- a/.gitlab/ci/configure_windows_borland_common.cmake +++ b/.gitlab/ci/configure_windows_borland_common.cmake @@ -1,2 +1,5 @@ +set(CMake_TEST_Java OFF CACHE BOOL "") + set(configure_no_sccache 1) + include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_windows_openwatcom_common.cmake b/.gitlab/ci/configure_windows_openwatcom_common.cmake index 6d66a05..55dce1d 100644 --- a/.gitlab/ci/configure_windows_openwatcom_common.cmake +++ b/.gitlab/ci/configure_windows_openwatcom_common.cmake @@ -1,2 +1,5 @@ +set(CMake_TEST_Java OFF CACHE BOOL "") + set(configure_no_sccache 1) + include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") -- cgit v0.12