Attached Files | java.patch [^] (2,224 bytes) 1969-12-31 19:00 [Show Content] [Hide Content]? FindOctave.cmake
Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.22
diff -u -3 -p -r1.22 FindJNI.cmake
--- FindJNI.cmake 8 Sep 2005 14:03:51 -0000 1.22
+++ FindJNI.cmake 15 Sep 2005 19:39:12 -0000
@@ -11,23 +11,28 @@
SET(JAVA_AWT_LIBRARY_DIRECTORIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
+ $ENV{JAVA_HOME}/jre/lib/i386
+ $ENV{JAVA_HOME}/jre/lib/amd64
/usr/lib
/usr/local/lib
/usr/lib/java/jre/lib/i386
/usr/local/lib/java/jre/lib/i386
/usr/lib/j2sdk1.4-sun/jre/lib/i386
/usr/lib/j2sdk1.5-sun/jre/lib/i386
+ /opt/sun-jdk-1.5.0.04/jre/lib/amd64
)
SET(JAVA_AWT_INCLUDE_DIRECTORIES
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
+ $ENV{JAVA_HOME}/include
/usr/include
/usr/local/include
/usr/lib/java/include
/usr/local/lib/java/include
/usr/lib/j2sdk1.4-sun/include
/usr/lib/j2sdk1.5-sun/include
+ /opt/sun-jdk-1.5.0.04/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.12
diff -u -3 -p -r1.12 FindJava.cmake
--- FindJava.cmake 8 Sep 2005 14:03:51 -0000 1.12
+++ FindJava.cmake 15 Sep 2005 19:39:12 -0000
@@ -16,6 +16,7 @@ SET(JAVA_BIN_PATH
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.5;JavaHome]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/bin"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/bin"
+ $ENV{JAVA_HOME}/bin
/usr/bin
/usr/lib/java/bin
/usr/share/java/bin
@@ -25,6 +26,7 @@ SET(JAVA_BIN_PATH
/usr/lib/j2sdk1.4-sun/bin
/usr/java/j2sdk1.4.2_09/bin
/usr/lib/j2sdk1.5-sun/bin
+ /opt/sun-jdk-1.5.0.04/bin
)
FIND_PROGRAM(JAVA_RUNTIME
NAMES java
|