From 5bb158f440b156552c7ad355a725bdfd1576c53f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Wed, 20 Jul 2005 12:53:06 -0400 Subject: [PATCH] ENH: java does not work under mingw --- Source/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 58729170d..25497a6b6 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -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)