diff options
| author | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-25 20:50:03 +0100 |
|---|---|---|
| committer | Maciej Mrozowski (reavertm) <reavertm@poczta.fm> | 2009-03-25 20:50:03 +0100 |
| commit | eb1a704a360368d0c733ef912bc311d85f6bb415 (patch) | |
| tree | 259cb47bbdafcff83b51abbd069341ab93b50ca9 /dev-util/cmake/files | |
| parent | d5b2e1806963fc0ea1e2583e02628e5452bee45a (diff) | |
| download | kde-eb1a704a360368d0c733ef912bc311d85f6bb415.tar.gz kde-eb1a704a360368d0c733ef912bc311d85f6bb415.tar.bz2 kde-eb1a704a360368d0c733ef912bc311d85f6bb415.zip | |
cmake updates: added FindJNI patch that makes it able to find IBM jdk, fixed Qt4 deps a bit, reordered variables to
ease merging in tools like kdiff3/kompare (SLOT is usually invariant so the idea is to place it between KEYWORDS
and IUSE), reformatted a bit for better (?) readability
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-FindJNI.patch | 71 |
1 files changed, 71 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-FindJNI.patch b/dev-util/cmake/files/cmake-FindJNI.patch new file mode 100644 index 00000000000..af723c52919 --- /dev/null +++ b/dev-util/cmake/files/cmake-FindJNI.patch @@ -0,0 +1,71 @@ +diff -ru ./Modules/FindJNI.cmake ../a/Modules/FindJNI.cmake +--- ./Modules/FindJNI.cmake 2009-02-21 21:36:50.000000000 +0100 ++++ ../a/Modules/FindJNI.cmake 2008-11-24 04:44:06.000000000 +0100 +@@ -2,7 +2,7 @@ + # This module finds if Java is installed and determines where the + # include files and libraries are. It also determines what the name of + # the library is. This code sets the following variables: +-# ++# + # JNI_INCLUDE_DIRS = the include dirs to use + # JNI_LIBRARIES = the libraries to use + # JAVA_AWT_LIBRARY = the path to the jawt library +@@ -51,6 +51,8 @@ + "${dir}" + "${dir}/client" + "${dir}/server" ++ "${dir}/j9vm" ++ "${dir}/classic" + ) + ENDFOREACH(dir) + +@@ -60,7 +62,7 @@ + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include" + "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include" + $ENV{JAVA_HOME}/include +- /usr/include ++ /usr/include + /usr/local/include + /usr/lib/java/include + /usr/local/lib/java/include +@@ -126,7 +128,7 @@ + ) + ENDIF(JAVA_HAVE_FRAMEWORK) + ELSE(APPLE) +- FIND_LIBRARY(JAVA_AWT_LIBRARY jawt ++ FIND_LIBRARY(JAVA_AWT_LIBRARY jawt + PATHS ${JAVA_AWT_LIBRARY_DIRECTORIES} + ) + FIND_LIBRARY(JAVA_JVM_LIBRARY NAMES jvm JavaVM +@@ -134,18 +136,23 @@ + ) + ENDIF(APPLE) + +-# add in the include path +-FIND_PATH(JAVA_INCLUDE_PATH jni.h ++# add in the include path ++FIND_PATH(JAVA_INCLUDE_PATH jni.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ) + +-FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h ++FIND_PATH(JAVA_INCLUDE_PATH2 jni_md.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ${JAVA_INCLUDE_PATH}/win32 + ${JAVA_INCLUDE_PATH}/linux + ${JAVA_INCLUDE_PATH}/freebsd + ) + ++FIND_PATH(JAVA_INCLUDE_PATH2 jniport.h ++ ${JAVA_AWT_INCLUDE_DIRECTORIES} ++ ${JAVA_INCLUDE_PATH} ++) ++ + FIND_PATH(JAVA_AWT_INCLUDE_PATH jawt.h + ${JAVA_AWT_INCLUDE_DIRECTORIES} + ${JAVA_INCLUDE_PATH} +@@ -169,4 +176,3 @@ + ${JAVA_INCLUDE_PATH2} + ${JAVA_AWT_INCLUDE_PATH} + ) +- |