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

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Oct 24 10:03:42 EDT 2006


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

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


Index: FindJNI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindJNI.cmake,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- FindJNI.cmake	12 Oct 2006 17:12:37 -0000	1.26
+++ FindJNI.cmake	24 Oct 2006 14:03:39 -0000	1.27
@@ -66,12 +66,9 @@
   IF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
     SET(JAVA_HAVE_FRAMEWORK 1)
   ENDIF(EXISTS /Library/Frameworks/JavaEmbedding.framework)
-  IF(EXISTS /System/Library/Frameworks/JavaEmbedding.framework)
-    SET(JAVA_HAVE_FRAMEWORK 1)
-  ENDIF(EXISTS /System/Library/Frameworks/JavaEmbedding.framework)
   IF(JAVA_HAVE_FRAMEWORK)
     IF(NOT JAVA_AWT_LIBRARY)
-      SET (JAVA_AWT_LIBRARY "-framework JavaVM -framework JavaEmbedding" CACHE FILEPATH "Java Frameworks" FORCE)
+      SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
     ENDIF(NOT JAVA_AWT_LIBRARY)
     SET(JAVA_AWT_INCLUDE_DIRECTORIES ${JAVA_AWT_INCLUDE_DIRECTORIES}
       ~/Library/Frameworks/JavaVM.framework/Headers



More information about the Cmake-commits mailing list