diff options
| author | Brad King <brad.king@kitware.com> | 2021-12-16 16:08:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-12-16 16:08:41 (GMT) |
| commit | 4d471f66303a095c8c366e4b95dcdb2d041d6991 (patch) | |
| tree | 65fb9cf862fb338a56d2fa1fbae8333a1b37c291 /.gitlab | |
| parent | 17c74ec4d791228e550cfb4b7c2b7e20bad11522 (diff) | |
| parent | 840fa28d3d308828ebc3516e436f2f9c7ee5bfa1 (diff) | |
| download | CMake-4d471f66303a095c8c366e4b95dcdb2d041d6991.zip CMake-4d471f66303a095c8c366e4b95dcdb2d041d6991.tar.gz CMake-4d471f66303a095c8c366e4b95dcdb2d041d6991.tar.bz2 | |
Merge topic 'ci-windows-no-java'
840fa28d3d ci: Explicitly disable Java tests on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6807
Diffstat (limited to '.gitlab')
| -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 37cd51c..e78c9ce 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 45250ac..112846a 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") |