From 6b9e217beeb2f8f35cd53e98f3e2243958e213f3 Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 27 Sep 2004 14:21:05 -0400
Subject: ENH: use jni.h to determine java version

---
 Source/CMakeLists.txt | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 7ef19f0..f3337b0 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -659,21 +659,29 @@ IF(BUILD_TESTING)
 
     INCLUDE(FindJava)
     IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
-      EXEC_PROGRAM(${JAVA_COMPILE} ARGS -version OUTPUT_VARIABLE OUT)
-      IF(OUT MATCHES "invalid flag")
-        MESSAGE("Skipping Java Test because ${JAVA_COMPILE} -version produced: ${OUT}")
-      ELSE(OUT MATCHES "invalid flag")
-        ADD_TEST(Java ${CMAKE_CTEST_COMMAND}
-          --build-and-test 
-          "${CMake_SOURCE_DIR}/Tests/Java"
-          "${CMake_BINARY_DIR}/Tests/Java"
-          --build-generator ${CMAKE_GENERATOR}
-          --build-project hello
-          --build-makeprogram ${MAKEPROGRAM}
-          --build-two-config 
-          --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
-          --test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
-      ENDIF(OUT MATCHES "invalid flag")
+      GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
+      FIND_FILE(JNI_H jni.h
+        "${JNIPATH}/../include"
+        "${JNIPATH}/../java/include")
+      IF(JNI_H)
+        FILE(READ ${JNI_H} JNI_FILE)
+        IF("${JNI_FILE}" MATCHES JDK1_2)
+          ADD_TEST(Java ${CMAKE_CTEST_COMMAND}
+            --build-and-test 
+            "${CMake_SOURCE_DIR}/Tests/Java"
+            "${CMake_BINARY_DIR}/Tests/Java"
+            --build-generator ${CMAKE_GENERATOR}
+            --build-project hello
+            --build-makeprogram ${MAKEPROGRAM}
+            --build-two-config 
+            --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
+            --test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
+        ELSE("${JNI_FILE}" MATCHES JDK1_2)
+          MESSAGE("No Java Test because ${JNI_FILE} does not contain JDK1_2 define")
+        ENDIF("${JNI_FILE}" MATCHES JDK1_2)
+      ELSE(JNI_H) 
+        MESSAGE("No Java Test because jni.h could not be found. tried:\n${JNIPATH}/../include and ${JNIPATH}/../java/include")
+      ENDIF(JNI_H) 
     ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
   ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
   
-- 
cgit v0.12