diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-20 16:53:06 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2005-07-20 16:53:06 (GMT) |
| commit | 5bb158f440b156552c7ad355a725bdfd1576c53f (patch) | |
| tree | b82415c1174d7757e497d469760ee863f2739d25 | |
| parent | 380f8f6b4b6bd1d775d17a8fbeb1205fc300ce92 (diff) | |
| download | CMake-5bb158f440b156552c7ad355a725bdfd1576c53f.zip CMake-5bb158f440b156552c7ad355a725bdfd1576c53f.tar.gz CMake-5bb158f440b156552c7ad355a725bdfd1576c53f.tar.bz2 | |
ENH: java does not work under mingw
| -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 5872917..25497a6 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) |