[Cmake-commits] [cmake-commits] hoffman committed FindJNI.cmake 1.40 1.41

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
Bug #09476, add more search paths for jni.


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.40
retrieving revision 1.41
diff -C 2 -d -r1.40 -r1.41
*** FindJNI.cmake	21 Apr 2009 21:12:32 -0000	1.40
--- FindJNI.cmake	16 Sep 2009 18:20:20 -0000	1.41
***************
*** 20,26 ****
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
!   $ENV{JAVA_HOME}/jre/lib/i386
    $ENV{JAVA_HOME}/jre/lib/amd64
    $ENV{JAVA_HOME}/jre/lib/ppc
    $ENV{JAVA_HOME}/lib
    /usr/lib
--- 20,37 ----
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/lib"
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/lib"
!   $ENV{JAVA_HOME}/jre/lib/alpha
    $ENV{JAVA_HOME}/jre/lib/amd64
+   $ENV{JAVA_HOME}/jre/lib/arm
+   $ENV{JAVA_HOME}/jre/lib/i386
+   $ENV{JAVA_HOME}/jre/lib/ia64
+   $ENV{JAVA_HOME}/jre/lib/m68k
+   $ENV{JAVA_HOME}/jre/lib/mips
+   $ENV{JAVA_HOME}/jre/lib/mipsel
+   $ENV{JAVA_HOME}/jre/lib/parisc
+   $ENV{JAVA_HOME}/jre/lib/powerpc
    $ENV{JAVA_HOME}/jre/lib/ppc
+   $ENV{JAVA_HOME}/jre/lib/s390
+   $ENV{JAVA_HOME}/jre/lib/sparc
+   $ENV{JAVA_HOME}/jre/lib/x86_64
    $ENV{JAVA_HOME}/lib
    /usr/lib