mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-03-05 06:08:41 -06:00
Code Issues Packages Projects Releases Wiki Activity

ENH: only use newer java for testing

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

26
Source/CMakeLists.txt
View File

@@ -659,17 +659,21 @@ IF(BUILD_TESTING)
INCLUDE(FindJava)
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
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)
--test-command ${JAVA_RUNTIME} HelloWorld)
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}
--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")
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")