diff options
| author | Brad King <brad.king@kitware.com> | 2022-02-15 14:53:33 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2022-02-15 14:53:55 (GMT) |
| commit | bdc6f379e14f1d0f8dca8aa947630262e32201dd (patch) | |
| tree | 840d65bed7e90fc18491a1e5aaeb6f26d0f9126c | |
| parent | 65cef33578df4ae32c6b668e277268131b39da68 (diff) | |
| parent | 4b90688aa0963e35c386a59612c02d605a7f68d0 (diff) | |
| download | CMake-bdc6f379e14f1d0f8dca8aa947630262e32201dd.zip CMake-bdc6f379e14f1d0f8dca8aa947630262e32201dd.tar.gz CMake-bdc6f379e14f1d0f8dca8aa947630262e32201dd.tar.bz2 | |
Merge topic 'ci-windows-no-java'
4b90688aa0 ci: Explicitly disable Java tests on Windows with Borland and Open Watcom
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6979
| -rw-r--r-- | .gitlab/ci/configure_windows_borland_common.cmake | 3 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_openwatcom_common.cmake | 3 |
2 files changed, 6 insertions, 0 deletions
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") |