[Cmake-commits] [cmake-commits] hoffman committed FindJNI.cmake 1.43 1.44

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
Fix for bug #9611, some more paths for OpenJDK.


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.43
retrieving revision 1.44
diff -C 2 -d -r1.43 -r1.44
*** FindJNI.cmake	30 Sep 2009 13:59:00 -0000	1.43
--- FindJNI.cmake	30 Sep 2009 18:15:23 -0000	1.44
***************
*** 26,30 ****
  #  License text for the above reference.)
  
! # Expand $libarch occurences to java_libarch subdirectory(-ies) and set ${_var}
  MACRO(java_append_library_directories _var)
      # Determine java arch-specific library subdir
--- 26,30 ----
  #  License text for the above reference.)
  
! # Expand {libarch} occurences to java_libarch subdirectory(-ies) and set ${_var}
  MACRO(java_append_library_directories _var)
      # Determine java arch-specific library subdir
***************
*** 85,88 ****
--- 85,89 ----
    /usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
    /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
+   /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
    # Debian specific paths for default JVM
    /usr/lib/jvm/default-java/jre/lib/{libarch}
***************
*** 115,122 ****
--- 116,126 ----
    /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/lib/jvm/java-6-openjdk/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
+   # Debian specific path for default JVM
+   /usr/lib/jvm/default-java/include
    )