[Cmake-commits] [cmake-commits] alex committed FindJNI.cmake 1.39 1.40

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
ENH: add even more search directories for debian-like systems (see #8821)

Alex


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.39
retrieving revision 1.40
diff -C 2 -d -r1.39 -r1.40
*** FindJNI.cmake	21 Apr 2009 21:09:29 -0000	1.39
--- FindJNI.cmake	21 Apr 2009 21:12:32 -0000	1.40
***************
*** 33,37 ****
    /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
--- 33,41 ----
    /usr/lib/j2sdk1.5-sun/jre/lib/i386
    /opt/sun-jdk-1.5.0.04/jre/lib/amd64
!   /usr/lib/jvm/java-6-sun/jre/lib/i386
!   /usr/lib/jvm/java-6-sun/jre/lib/amd64
!   /usr/lib/jvm/java-1.5.0-sun/jre/lib/i386
!   /usr/lib/jvm/java-1.5.0-sun/jre/lib/amd64
!   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64       # can this one be removed according to #8821 ? Alex
    /usr/lib/java/jre/lib/amd64
    /usr/local/lib/java/jre/lib/amd64
***************
*** 67,71 ****
    /usr/local/lib/java/include
    /usr/lib/jvm/java/include
!   /usr/lib/jvm/java-6-sun-1.6.0.00/include
    /usr/local/share/java/include
    /usr/lib/j2sdk1.4-sun/include
--- 71,77 ----
    /usr/local/lib/java/include
    /usr/lib/jvm/java/include
!   /usr/lib/jvm/java-6-sun/include
!   /usr/lib/jvm/java-1.5.0-sun/include
!   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
    /usr/local/share/java/include
    /usr/lib/j2sdk1.4-sun/include