kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: remove JavaEmbedding

Browse Source
This commit is contained in:
Bill Hoffman 2006-10-27 15:59:40 -04:00
parent 6dba95cb2a
commit f23ade5c02
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Modules/FindJNI.cmake
View File

@ -60,12 +60,12 @@ FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}")
ENDFOREACH(JAVA_PROG) ENDFOREACH(JAVA_PROG)
IF(APPLE) IF(APPLE)
IF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework) IF(EXISTS ~/Library/Frameworks/JavaVM.framework)
SET(JAVA_HAVE_FRAMEWORK 1) SET(JAVA_HAVE_FRAMEWORK 1)
ENDIF(EXISTS ~/Library/Frameworks/JavaEmbedding.framework) ENDIF(EXISTS ~/Library/Frameworks/JavaVM.framework)
IF(EXISTS /Library/Frameworks/JavaEmbedding.framework) IF(EXISTS /Library/Frameworks/JavaVM.framework)
SET(JAVA_HAVE_FRAMEWORK 1) SET(JAVA_HAVE_FRAMEWORK 1)
ENDIF(EXISTS /Library/Frameworks/JavaEmbedding.framework) ENDIF(EXISTS /Library/Frameworks/JavaVM.framework)
IF(JAVA_HAVE_FRAMEWORK) IF(JAVA_HAVE_FRAMEWORK)
IF(NOT JAVA_AWT_LIBRARY) IF(NOT JAVA_AWT_LIBRARY)
SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE) SET (JAVA_AWT_LIBRARY "-framework JavaVM" CACHE FILEPATH "Java Frameworks" FORCE)
@ -74,9 +74,6 @@ IF(APPLE)
~/Library/Frameworks/JavaVM.framework/Headers ~/Library/Frameworks/JavaVM.framework/Headers
/Library/Frameworks/JavaVM.framework/Headers /Library/Frameworks/JavaVM.framework/Headers
/System/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) ENDIF(JAVA_HAVE_FRAMEWORK)
ELSE(APPLE) ELSE(APPLE)