[Cmake-commits] [cmake-commits] hoffman committed FindJNI.cmake 1.34 1.34.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	FindJNI.cmake 
Log Message:
ENH: merge from head for RC7


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.34
retrieving revision 1.34.2.1
diff -C 2 -d -r1.34 -r1.34.2.1
*** FindJNI.cmake	16 Jan 2008 15:04:36 -0000	1.34
--- FindJNI.cmake	9 Apr 2008 18:57:31 -0000	1.34.2.1
***************
*** 27,30 ****
--- 27,31 ----
    /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
***************
*** 32,36 ****
    /usr/lib/j2sdk1.5-sun/jre/lib/amd64
    )
- 
  SET(JAVA_JVM_LIBRARY_DIRECTORIES)
  FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
--- 33,36 ----
***************
*** 53,56 ****
--- 53,57 ----
    /usr/lib/java/include
    /usr/local/lib/java/include
+   /usr/lib/jvm/java-6-sun-1.6.0.00/include
    /usr/local/share/java/include
    /usr/lib/j2sdk1.4-sun/include