diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-27 19:21:44 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2004-09-27 19:21:44 (GMT) |
| commit | de3cc6f217b9b04930c70a1859b36fe0d90a7e45 (patch) | |
| tree | 6a528b1d6a1d0271f9b41c02ba89d3651d3307ec /Source | |
| parent | a69275d37be966a83ed47669ce8724f80a223e4f (diff) | |
| download | CMake-de3cc6f217b9b04930c70a1859b36fe0d90a7e45.zip CMake-de3cc6f217b9b04930c70a1859b36fe0d90a7e45.tar.gz CMake-de3cc6f217b9b04930c70a1859b36fe0d90a7e45.tar.bz2 | |
ENH: allow for a different jni.h to enable java testing
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 07289c3..5e098c7 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|JNI_VERSION_1_2") + IF("${JNI_FILE}" MATCHES "JDK1_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|JNI_VERSION_1_2") + ELSE("${JNI_FILE}" MATCHES "JDK1_2") MESSAGE("No Java Test because ${JNI_H} does not contain JDK1_2 define") - ENDIF("${JNI_FILE}" MATCHES "JDK1_2|JNI_VERSION_1_2") + 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) |