Attached Files | java.patch [^] (1,233 bytes) 1969-12-31 19:00 [Show Content] [Hide Content]Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.17
diff -u -3 -p -r1.17 FindJNI.cmake
--- FindJNI.cmake 6 Feb 2004 15:49:46 -0000 1.17
+++ FindJNI.cmake 3 Feb 2005 01:40:13 -0000
@@ -15,6 +15,7 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/lib
/usr/lib/java/jre/lib/i386
/usr/local/lib/java/jre/lib/i386
+ /usr/lib/j2sdk1.4-sun/jre/lib/i386
)
SET(JAVA_AWT_INCLUDE_DIRECTORIES
@@ -24,6 +25,7 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES
/usr/local/include
/usr/lib/java/include
/usr/local/lib/java/include
+ /usr/lib/j2sdk1.4-sun/include
)
FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.7
diff -u -3 -p -r1.7 FindJava.cmake
--- FindJava.cmake 20 Sep 2004 18:39:44 -0000 1.7
+++ FindJava.cmake 3 Feb 2005 01:40:13 -0000
@@ -22,6 +22,7 @@ SET(JAVA_BIN_PATH
/usr/local/bin
/usr/local/java/bin
/usr/java/j2sdk1.4.2_04
+ /usr/lib/j2sdk1.4-sun/bin
)
FIND_PROGRAM(JAVA_RUNTIME
NAMES java
|