mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 19:00:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

ci: Explicitly disable Java tests on Windows

Browse Source 
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.
This commit is contained in:
Brad King
2021-12-16 07:46:48 -05:00
parent cee2d5b1e2
commit 840fa28d3d
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/ci/configure_macos_common.cmake
View File

@@ -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

1
.gitlab/ci/configure_windows_common.cmake
View File

@@ -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")