From a69275d37be966a83ed47669ce8724f80a223e4f Mon Sep 17 00:00:00 2001
From: Bill Hoffman <bill.hoffman@kitware.com>
Date: Mon, 27 Sep 2004 15:15:59 -0400
Subject: ENH: allow for a different jni.h to enable java testing
---
Source/CMakeLists.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index ac6c610..07289c3 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -665,7 +665,7 @@ IF(BUILD_TESTING)
"${JNIPATH}/../java/include")
IF(JNI_H)
FILE(READ "${JNI_H}" JNI_FILE)
- IF("${JNI_FILE}" MATCHES JDK1_2)
+ IF("${JNI_FILE}" MATCHES "JDK1_2|JNI_VERSION_1_2")
ADD_TEST(Java ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Java"
@@ -676,9 +676,9 @@ IF(BUILD_TESTING)
--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)
+ ELSE("${JNI_FILE}" MATCHES "JDK1_2|JNI_VERSION_1_2")
MESSAGE("No Java Test because ${JNI_H} does not contain JDK1_2 define")
- ENDIF("${JNI_FILE}" MATCHES JDK1_2)
+ ENDIF("${JNI_FILE}" MATCHES "JDK1_2|JNI_VERSION_1_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)
--
cgit v0.12