浏览代码

Tests: Check for the new Java exeutable variables.

Andreas Schneider 14 年之前
父节点
当前提交
a22ed3d62d
共有 1 个文件被更改,包括 2 次插入2 次删除
  1. 2 2
      Tests/CMakeLists.txt

+ 2 - 2
Tests/CMakeLists.txt

@@ -1868,8 +1868,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
     ENDIF()
     ENDIF()
   ENDIF()
   ENDIF()
 
 
-  find_package(Java QUIET)
-  IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW
+  find_package(Java COMPONENTS Development QUIET)
+  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