[Cmake-commits] [cmake-commits] alex committed FindJNI.cmake 1.36 1.37

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
BUG: #7360: add support for FreeBSD
BUG: #7345: add support for ppc

Alex


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.36
retrieving revision 1.37
diff -C 2 -d -r1.36 -r1.37
*** FindJNI.cmake	20 Jul 2008 19:39:02 -0000	1.36
--- FindJNI.cmake	20 Jul 2008 19:45:49 -0000	1.37
***************
*** 22,25 ****
--- 22,26 ----
    $ENV{JAVA_HOME}/jre/lib/i386
    $ENV{JAVA_HOME}/jre/lib/amd64
+   $ENV{JAVA_HOME}/jre/lib/ppc
    /usr/lib
    /usr/local/lib
***************
*** 30,39 ****
    /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/lib/jvm/java-6-sun-1.6.0.00/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
    )
  
--- 31,45 ----
    /usr/lib/j2sdk1.5-sun/jre/lib/i386
    /opt/sun-jdk-1.5.0.04/jre/lib/amd64
    /usr/lib/jvm/java-6-sun-1.6.0.00/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
+   /usr/lib/java/jre/lib/ppc
+   /usr/local/lib/java/jre/lib/ppc
+   /usr/local/share/java/jre/lib/ppc
+   /usr/lib/j2sdk1.4-sun/jre/lib/ppc
+   /usr/lib/j2sdk1.5-sun/jre/lib/ppc
    )
  
***************
*** 136,139 ****
--- 142,146 ----
    ${JAVA_INCLUDE_PATH}/win32
    ${JAVA_INCLUDE_PATH}/linux
+   ${JAVA_INCLUDE_PATH}/freebsd
  )