[cmake-commits] hoffman committed FindJNI.cmake 1.27 1.28

[cmake-commits at cmake.org]

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

Modified Files:
	FindJNI.cmake 
Log Message:
ENH: remove JavaEmbedding


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- FindJNI.cmake	24 Oct 2006 14:03:39 -0000	1.27
+++ FindJNI.cmake	27 Oct 2006 19:59:40 -0000	1.28
@@ -60,12 +60,12 @@
 ENDFOREACH(JAVA_PROG)
 
 IF(APPLE)
-  IF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework)
+  IF(EXISTS ~/Library/Frameworks/JavaVM.framework)
     SET(JAVA_HAVE_FRAMEWORK 1)
-  ENDIF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework)
-  IF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
+  ENDIF(EXISTS ~/Library/Frameworks/JavaVM.framework)
+  IF(EXISTS /Library/Frameworks/JavaVM.framework)
     SET(JAVA_HAVE_FRAMEWORK 1)
-  ENDIF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
+  ENDIF(EXISTS /Library/Frameworks/JavaVM.framework)
   IF(JAVA_HAVE_FRAMEWORK)
     IF(NOT JAVA_AWT_LIBRARY)
       SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
@@ -74,9 +74,6 @@
       ~/Library/Frameworks/JavaVM.framework/Headers
       /Library/Frameworks/JavaVM.framework/Headers
       /System/Library/Frameworks/JavaVM.framework/Headers
-      ~/Library/Frameworks/JavaEmbedding.framework/Headers
-      /Library/Frameworks/JavaEmbedding.framework/Headers
-      /System/Library/Frameworks/JavaEmbedding.framework/Headers
       )
   ENDIF(JAVA_HAVE_FRAMEWORK)
 ELSE(APPLE)