[cmake-commits] hoffman committed FindJNI.cmake 1.25.2.1 1.25.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	FindJNI.cmake 
Log Message:
ENH: move from main tree


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.25.2.1
retrieving revision 1.25.2.2
diff -u -d -r1.25.2.1 -r1.25.2.2
--- FindJNI.cmake	27 Oct 2006 20:01:46 -0000	1.25.2.1
+++ FindJNI.cmake	30 Oct 2006 14:17:00 -0000	1.25.2.2
@@ -4,7 +4,9 @@
 # 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.h
 #  JAVA_AWT_INCLUDE_PATH = the include path to jawt.h
 # 
 
@@ -28,6 +30,17 @@
   /usr/lib/j2sdk1.5-sun/jre/lib/amd64
   )
 
+SET(JAVA_JVM_LIBRARY_DIRECTORIES)
+FOREACH(dir ${JAVA_AWT_LIBRARY_DIRECTORIES})
+  SET(JAVA_JVM_LIBRARY_DIRECTORIES
+    ${JAVA_JVM_LIBRARY_DIRECTORIES}
+    "${dir}"
+    "${dir}/client"
+    "${dir}/server"
+    )
+ENDFOREACH(dir)
+
+
 SET(JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
@@ -70,6 +83,9 @@
     IF(NOT JAVA_AWT_LIBRARY)
       SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
     ENDIF(NOT JAVA_AWT_LIBRARY)
+    IF(NOT JAVA_JVM_LIBRARY)
+      SET (JAVA_JVM_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
+    ENDIF(NOT JAVA_JVM_LIBRARY)
     SET(JAVA_AWT_INCLUDE_DIRECTORIES ${JAVA_AWT_INCLUDE_DIRECTORIES}
       ~/Library/Frameworks/JavaVM.framework/Headers
       /Library/Frameworks/JavaVM.framework/Headers
@@ -80,6 +96,9 @@
   FIND_LIBRARY(JAVA_AWT_LIBRARY jawt 
     PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES}
   )
+  FIND_LIBRARY(JAVA_JVM_LIBRARY jvm 
+    PATHS ${JAVA_JVM_LIBRARY_DIRECTORIES}
+  )
 ENDIF(APPLE)
 
 # add in the include path    
@@ -98,6 +117,7 @@
 
 MARK_AS_ADVANCED(
   JAVA_AWT_LIBRARY
+  JAVA_JVM_LIBRARY
   JAVA_AWT_INCLUDE_PATH
   JAVA_INCLUDE_PATH
   JAVA_INCLUDE_PATH2