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

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
BUG: fix #6416: provide JNI_LIBRARIES and JNI_INCLUDE_DIRS

Alex


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.35
retrieving revision 1.36
diff -C 2 -d -r1.35 -r1.36
*** FindJNI.cmake	8 Apr 2008 20:09:36 -0000	1.35
--- FindJNI.cmake	20 Jul 2008 19:39:02 -0000	1.36
***************
*** 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"
***************
*** 33,36 ****
--- 37,41 ----
    /usr/lib/j2sdk1.5-sun/jre/lib/amd64
    )
+ 
  SET(JAVA_JVM_LIBRARY_DIRECTORIES)
  FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
***************
*** 145,146 ****
--- 150,163 ----
    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}
+ )
+