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

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	FindJNI.cmake 
Log Message:
ENH: merge in from main tree and fix bug for flex and yacc stuff in SecondLife


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.34.2.1
retrieving revision 1.34.2.2
diff -C 2 -d -r1.34.2.1 -r1.34.2.2
*** FindJNI.cmake	9 Apr 2008 18:57:31 -0000	1.34.2.1
--- FindJNI.cmake	26 Jul 2008 03:23:54 -0000	1.34.2.2
***************
*** 4,15 ****
  # the library is. This code sets the following variables:
  #   
! #  JAVA_AWT_LIB_PATH     = the path to the jawt library
! #  JAVA_JVM_LIB_PATH     = the path to the jvm library
  #  JAVA_INCLUDE_PATH     = the include path to jni.h
  #  JAVA_INCLUDE_PATH2    = the include path to jni_md.h
  #  JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
! # 
  GET_FILENAME_COMPONENT(java_install_version
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
  SET(JAVA_AWT_LIBRARY_DIRECTORIES
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
--- 4,19 ----
  # the library is. This code sets the following variables:
  #   
! #  JNI_INCLUDE_DIRS      = the include dirs to use
! #  JNI_LIBRARIES         = the libraries to use
! #  JAVA_AWT_LIBRARY      = the path to the jawt library
! #  JAVA_JVM_LIBRARY      = the path to the jvm library
  #  JAVA_INCLUDE_PATH     = the include path to jni.h
  #  JAVA_INCLUDE_PATH2    = the include path to jni_md.h
  #  JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
! #
! 
  GET_FILENAME_COMPONENT(java_install_version
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit;CurrentVersion]" NAME)
+ 
  SET(JAVA_AWT_LIBRARY_DIRECTORIES
    "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/lib"
***************
*** 18,23 ****
--- 22,29 ----
    $ENV{JAVA_HOME}/jre/lib/i386
    $ENV{JAVA_HOME}/jre/lib/amd64
+   $ENV{JAVA_HOME}/jre/lib/ppc
    /usr/lib
    /usr/local/lib
+   /usr/lib/jvm/java/lib
    /usr/lib/java/jre/lib/i386
    /usr/local/lib/java/jre/lib/i386
***************
*** 26,36 ****
    /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
    )
  SET(JAVA_JVM_LIBRARY_DIRECTORIES)
  FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
--- 32,48 ----
    /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
    )
+ 
  SET(JAVA_JVM_LIBRARY_DIRECTORIES)
  FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
***************
*** 53,56 ****
--- 65,69 ----
    /usr/lib/java/include
    /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
***************
*** 131,134 ****
--- 144,148 ----
    ${JAVA_INCLUDE_PATH}/win32
    ${JAVA_INCLUDE_PATH}/linux
+   ${JAVA_INCLUDE_PATH}/freebsd
  )
  
***************
*** 145,146 ****
--- 159,172 ----
    JAVA_INCLUDE_PATH2
  )
+ 
+ SET(JNI_LIBRARIES
+   ${JAVA_AWT_LIBRARY}
+   ${JAVA_JVM_LIBRARY}
+ )
+ 
+ SET(JNI_INCLUDE_DIRS
+   ${JAVA_INCLUDE_PATH}
+   ${JAVA_INCLUDE_PATH2}
+   ${JAVA_AWT_INCLUDE_PATH}
+ )
+