[cmake-commits] andy committed FindJNI.cmake 1.25 1.26 FindJava.cmake 1.15 1.16

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv7285

Modified Files:
	FindJNI.cmake FindJava.cmake 
Log Message:
ENH: More locations for Java


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- FindJNI.cmake	15 Dec 2005 15:41:19 -0000	1.25
+++ FindJNI.cmake	12 Oct 2006 17:12:37 -0000	1.26
@@ -17,9 +17,15 @@
   /usr/local/lib
   /usr/lib/java/jre/lib/i386
   /usr/local/lib/java/jre/lib/i386
+  /usr/local/share/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
+  /usr/lib/java/jre/lib/amd64
+  /usr/local/lib/java/jre/lib/amd64
+  /usr/local/share/java/jre/lib/amd64
+  /usr/lib/j2sdk1.4-sun/jre/lib/amd64
+  /usr/lib/j2sdk1.5-sun/jre/lib/amd64
   )
 
 SET(JAVA_AWT_INCLUDE_DIRECTORIES
@@ -30,6 +36,7 @@
   /usr/local/include
   /usr/lib/java/include
   /usr/local/lib/java/include
+  /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include
   /opt/sun-jdk-1.5.0.04/include

Index: FindJava.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJava.cmake,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- FindJava.cmake	15 Dec 2005 15:41:19 -0000	1.15
+++ FindJava.cmake	12 Oct 2006 17:12:37 -0000	1.16
@@ -22,6 +22,7 @@
   /usr/share/java/bin
   /usr/local/bin
   /usr/local/java/bin
+  /usr/local/java/share/bin
   /usr/java/j2sdk1.4.2_04
   /usr/lib/j2sdk1.4-sun/bin
   /usr/java/j2sdk1.4.2_09/bin