summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-06-07 14:52:18 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-06-07 14:52:24 (GMT)
commitcf34dfeee9fb74cade92eb26522efc71510aed79 (patch)
tree8a1a0ef28c51d06dc2b4bcea4fdaf138cce6c51e
parent3536a8a52d27f2a546bc55c1b0490badca9b9b1e (diff)
parentfdeb2379347e2bac6a513b30505004e138358d67 (diff)
downloadCMake-cf34dfeee9fb74cade92eb26522efc71510aed79.zip
CMake-cf34dfeee9fb74cade92eb26522efc71510aed79.tar.gz
CMake-cf34dfeee9fb74cade92eb26522efc71510aed79.tar.bz2
Merge topic 'tests-java-compiler-var'
fdeb237934 Tests: Use Java_JAVAC_EXECUTABLE variable consistently Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7327
-rw-r--r--Tests/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7fdfaea..24e98f4 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3367,7 +3367,7 @@ if(BUILD_TESTING)
set(JavaExportImport_BUILD_OPTIONS -DCMake_TEST_NESTED_MAKE_PROGRAM:FILEPATH=${CMake_TEST_EXPLICIT_MAKE_PROGRAM})
ADD_TEST_MACRO(JavaExportImport JavaExportImport)
- get_filename_component(JNIPATH ${JAVA_COMPILE} PATH)
+ get_filename_component(JNIPATH ${Java_JAVAC_EXECUTABLE} PATH)
find_file(JNI_H jni.h
"${JNIPATH}/../include"
"${JNIPATH}/../java/include")