diff options
author | Ken Martin <ken.martin@kitware.com> | 2004-09-24 15:34:57 (GMT) |
---|---|---|
committer | Ken Martin <ken.martin@kitware.com> | 2004-09-24 15:34:57 (GMT) |
commit | 1ffbc81061e80e738d9d488224bdd76aa960e893 (patch) | |
tree | 497dc1eface4dc26aaa401140d2577e1dd9dc798 | |
parent | 5360480b5ab42361ee9c81782bbaf053fe55394f (diff) | |
download | CMake-1ffbc81061e80e738d9d488224bdd76aa960e893.zip CMake-1ffbc81061e80e738d9d488224bdd76aa960e893.tar.gz CMake-1ffbc81061e80e738d9d488224bdd76aa960e893.tar.bz2 |
ENH: check for all parts of java
-rw-r--r-- | Source/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index f98c168..003a358 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -658,7 +658,7 @@ IF(BUILD_TESTING) ENDIF(CMAKE_Fortran_COMPILER_FULLPATH) INCLUDE(FindJava) - IF(JAVA_COMPILE) + IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE) ADD_TEST(Java ${CMAKE_CTEST_COMMAND} --build-and-test "${CMake_SOURCE_DIR}/Tests/Java" @@ -670,7 +670,7 @@ IF(BUILD_TESTING) --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/" # --test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld) --test-command ${JAVA_RUNTIME} HelloWorld) - ENDIF(JAVA_COMPILE) + ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE) ENDIF(CMAKE_GENERATOR MATCHES "Makefiles") IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR) |