diff options
| author | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-27 19:59:40 (GMT) |
|---|---|---|
| committer | Bill Hoffman <bill.hoffman@kitware.com> | 2006-10-27 19:59:40 (GMT) |
| commit | f23ade5c02f84464ad4488491cd02180c768e62c (patch) | |
| tree | d50c664ba2d47213a1258f4a1216966f5da9c370 /Modules/FindJNI.cmake | |
| parent | 6dba95cb2a78949f12969fa4f64b4170546c5a46 (diff) | |
| download | CMake-f23ade5c02f84464ad4488491cd02180c768e62c.zip CMake-f23ade5c02f84464ad4488491cd02180c768e62c.tar.gz CMake-f23ade5c02f84464ad4488491cd02180c768e62c.tar.bz2 | |
ENH: remove JavaEmbedding
Diffstat (limited to 'Modules/FindJNI.cmake')
| -rw-r--r-- | Modules/FindJNI.cmake | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 9bbad96..781fecd 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -60,12 +60,12 @@ FOREACH(JAVA_PROG "${JAVA_RUNTIME}" "${JAVA_COMPILE}" "${JAVA_ARCHIVE}") 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 @@ IF(APPLE) ~/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) |