summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-11-24 12:19:38 -0500
committerBrad King <brad.king@kitware.com>2020-11-24 13:29:30 -0500
commit1af2d1d0eac17ef87d75f1a4c6d480274c12d0b0 (patch)
tree95aadf3df64204154ac9b3a3c06d9140f270360e /.gitlab
parent64fb825438a2fecb9eab9933d5d1b926bf6f294b (diff)
downloadcmake-1af2d1d0eac17ef87d75f1a4c6d480274c12d0b0.tar.gz
Tests: Add CMake_TEST_Java option to control Java tests
Diffstat (limited to '.gitlab')
-rw-r--r--.gitlab/ci/configure_macos_common.cmake4
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab/ci/configure_macos_common.cmake b/.gitlab/ci/configure_macos_common.cmake
index 3d09779a6c..4bd3c7d0bf 100644
--- a/.gitlab/ci/configure_macos_common.cmake
+++ b/.gitlab/ci/configure_macos_common.cmake
@@ -2,9 +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(Java_JAVA_EXECUTABLE "" CACHE FILEPATH "")
-set(Java_JAVAC_EXECUTABLE "" CACHE FILEPATH "")
-set(Java_JAR_EXECUTABLE "" CACHE FILEPATH "")
+set(CMake_TEST_Java 0 CACHE FILEPATH "")
# 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