ENH: check for all parts of java
This commit is contained in:
parent
5360480b5a
commit
1ffbc81061
|
@ -658,7 +658,7 @@ IF(BUILD_TESTING)
|
||||||
ENDIF(CMAKE_Fortran_COMPILER_FULLPATH)
|
ENDIF(CMAKE_Fortran_COMPILER_FULLPATH)
|
||||||
|
|
||||||
INCLUDE(FindJava)
|
INCLUDE(FindJava)
|
||||||
IF(JAVA_COMPILE)
|
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
|
||||||
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"
|
||||||
|
@ -670,7 +670,7 @@ IF(BUILD_TESTING)
|
||||||
--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)
|
--test-command ${JAVA_RUNTIME} HelloWorld)
|
||||||
ENDIF(JAVA_COMPILE)
|
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
|
||||||
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
|
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
|
||||||
|
|
||||||
IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
||||||
|
|
Loading…
Reference in New Issue