mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-14 18:38:50 -05:00
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
This commit is contained in:
@@ -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")
|
||||
|
||||
Reference in New Issue
Block a user