diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-16 07:46:48 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-12-16 11:03:30 -0500 |
| commit | 840fa28d3d308828ebc3516e436f2f9c7ee5bfa1 (patch) | |
| tree | 21fde848ad89eaf3a7fc3ca1d8e29d7cfc6bbdfb /.gitlab/ci | |
| parent | cee2d5b1e2519a7c72d5c2ffef2f8ca1415caff2 (diff) | |
| download | cmake-840fa28d3d308828ebc3516e436f2f9c7ee5bfa1.tar.gz | |
ci: Explicitly disable Java tests on Windows
Avoid searching for a Java installation on Windows hosts.
This will allow some CI hosts to have Java for other projects.
We already do this on macOS. While at it, clarify the macOS setting.
Diffstat (limited to '.gitlab/ci')
| -rw-r--r-- | .gitlab/ci/configure_macos_common.cmake | 2 | ||||
| -rw-r--r-- | .gitlab/ci/configure_windows_common.cmake | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake index 37cd51c205..e78c9cec33 100644 --- a/.gitlab/ci/configure_macos_common.cmake +++ b/.gitlab/ci/configure_macos_common.cmake @@ -2,7 +2,7 @@ # detect that Java is available and working, but a test machine then not have a # working Java installed. To work around this, just act as if Java is not # available on any CI machine. -set(CMake_TEST_Java 0 CACHE FILEPATH "") +set(CMake_TEST_Java OFF CACHE BOOL "") # Qt binaries get placed inside the source directory, which causes them to not # be included in the install-time rpath, but we still want them in the diff --git a/.gitlab/ci/configure_windows_common.cmake b/.gitlab/ci/configure_windows_common.cmake index 45250acbe2..112846a9ad 100644 --- a/.gitlab/ci/configure_windows_common.cmake +++ b/.gitlab/ci/configure_windows_common.cmake @@ -1,4 +1,5 @@ set(BUILD_QtDialog ON CACHE BOOL "") set(CMAKE_PREFIX_PATH "$ENV{CI_PROJECT_DIR}/.gitlab/qt" CACHE STRING "") +set(CMake_TEST_Java OFF CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake") |