kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: allow for a different jni.h to enable java testing

This commit is contained in:
Bill Hoffman 2004-09-27 15:15:59 -04:00
parent 591fa1daea
commit a69275d37b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/CMakeLists.txt
View File

@ -665,7 +665,7 @@ IF(BUILD_TESTING)
"${JNIPATH}/../java/include") "${JNIPATH}/../java/include")
IF(JNI_H) IF(JNI_H)
FILE(READ "${JNI_H}" JNI_FILE) 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} ADD_TEST(Java ${CMAKE_CTEST_COMMAND}
--build-and-test --build-and-test
"${CMake_SOURCE_DIR}/Tests/Java" "${CMake_SOURCE_DIR}/Tests/Java"
@ -676,9 +676,9 @@ IF(BUILD_TESTING)
--build-two-config --build-two-config
--build-run-dir "${CMake_BINARY_DIR}/Tests/Java/" --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
--test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld) --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") 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) ELSE(JNI_H)
MESSAGE("No Java Test because jni.h could not be found. tried:\n${JNIPATH}/../include and ${JNIPATH}/../java/include") MESSAGE("No Java Test because jni.h could not be found. tried:\n${JNIPATH}/../include and ${JNIPATH}/../java/include")
ENDIF(JNI_H) ENDIF(JNI_H)