ENH: java does not work under mingw
This commit is contained in:
parent
380f8f6b4b
commit
5bb158f440
|
@ -877,7 +877,7 @@ IF(BUILD_TESTING)
|
|||
ENDIF(CMAKE_Fortran_COMPILER_FULLPATH)
|
||||
|
||||
INCLUDE(FindJava)
|
||||
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
|
||||
IF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
|
||||
GET_FILENAME_COMPONENT(JNIPATH ${JAVA_COMPILE} PATH)
|
||||
FIND_FILE(JNI_H jni.h
|
||||
"${JNIPATH}/../include"
|
||||
|
@ -897,7 +897,7 @@ IF(BUILD_TESTING)
|
|||
--test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
|
||||
ENDIF("${JNI_FILE}" MATCHES "JDK1_2")
|
||||
ENDIF(JNI_H)
|
||||
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE)
|
||||
ENDIF(JAVA_COMPILE AND JAVA_RUNTIME AND JAVA_ARCHIVE AND NOT MINGW)
|
||||
ENDIF(CMAKE_GENERATOR MATCHES "Makefiles")
|
||||
|
||||
IF (CMAKE_WXWINDOWS_WXCONFIG_EXECUTABLE OR WXWINDOWS_INCLUDE_DIR)
|
||||
|
|
Loading…
Reference in New Issue