Tests: Check for the new Java exeutable variables.
This commit is contained in:
parent
c177c8e6b8
commit
a22ed3d62d
|
@ -1868,8 +1868,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
|
||||||
ENDIF()
|
ENDIF()
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
find_package(Java QUIET)
|
find_package(Java COMPONENTS Development QUIET)
|
||||||
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW
|
IF(Java_JAVA_EXECUTABLE AND Java_JAVAC_EXECUTABLE AND Java_JAR_EXECUTABLE AND NOT MINGW
|
||||||
AND NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Xcode")
|
AND NOT "${CMAKE_TEST_GENERATOR}" MATCHES "Xcode")
|
||||||
GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
|
GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
|
||||||
FIND_FILE(JNI_H jni.h
|
FIND_FILE(JNI_H jni.h
|
||||||
|
|
Loading…
Reference in New Issue