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

ENH: only use newer java for testing

This commit is contained in:
Bill Hoffman 2004-09-24 16:34:20 -04:00
parent 0a26f8d46c
commit 4b87fdada4
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CMakeLists.txt
View File

@ -659,6 +659,10 @@ IF(BUILD_TESTING)
INCLUDE(FindJava) INCLUDE(FindJava)
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE) IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
EXEC_PROGRAM(${CMAKE_Java_COMPILER} -version OUTPUT_VARIABLE OUT)
IF(OUT MATCHES "invalid flag")
MESSAGE("This java does not even know what version it is!")
ELSE(OUT MATCHES "invalid flag")
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"
@ -668,8 +672,8 @@ IF(BUILD_TESTING)
--build-makeprogram ${MAKEPROGRAM} --build-makeprogram ${MAKEPROGRAM}
--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)
--test-command ${JAVA_RUNTIME} HelloWorld) ENDIF(OUT MATCHES "invalid flag")
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE) ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")