Browse Source

Merge topic 'ci-windows-no-java'

840fa28d3d ci: Explicitly disable Java tests on Windows

Acked-by: Kitware Robot <[email protected]>
Merge-request: !6807
Brad King 4 years ago
parent
commit
4d471f6630

+ 1 - 1
.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
 # 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
 # working Java installed. To work around this, just act as if Java is not
 # available on any CI machine.
 # 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
 # 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
 # be included in the install-time rpath, but we still want them in the

+ 1 - 0
.gitlab/ci/configure_windows_common.cmake

@@ -1,4 +1,5 @@
 set(BUILD_QtDialog ON CACHE BOOL "")
 set(BUILD_QtDialog ON CACHE BOOL "")
 set(CMAKE_PREFIX_PATH "$ENV{CI_PROJECT_DIR}/.gitlab/qt" CACHE STRING "")
 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")
 include("${CMAKE_CURRENT_LIST_DIR}/configure_common.cmake")