diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2011-03-21 11:44:27 (GMT) |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-03-29 09:54:42 (GMT) |
| commit | a22ed3d62da7fad10eb1268ba4a359c62ad50488 (patch) | |
| tree | f4fd4f7b71f85daf86118849d26f46e8d0c9346f | |
| parent | c177c8e6b829f1dca4bbb81debd362d143868cf2 (diff) | |
| download | CMake-a22ed3d62da7fad10eb1268ba4a359c62ad50488.zip CMake-a22ed3d62da7fad10eb1268ba4a359c62ad50488.tar.gz CMake-a22ed3d62da7fad10eb1268ba4a359c62ad50488.tar.bz2 | |
Tests: Check for the new Java exeutable variables.
| -rw-r--r-- | Tests/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 77c5752..db880c1 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1868,8 +1868,8 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/ 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") GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH) FIND_FILE(JNI_H jni.h |