diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2009-04-21 21:12:32 (GMT) |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2009-04-21 21:12:32 (GMT) |
| commit | f1149df8cf6a8831c48e3bd573b25ae021f2cbe5 (patch) | |
| tree | d3cdb34b915d12c56065ad7b821cd5da2a09d6d8 | |
| parent | e16d1e37f33c8e6d07e731fb0653960851cf6aa2 (diff) | |
| download | CMake-f1149df8cf6a8831c48e3bd573b25ae021f2cbe5.zip CMake-f1149df8cf6a8831c48e3bd573b25ae021f2cbe5.tar.gz CMake-f1149df8cf6a8831c48e3bd573b25ae021f2cbe5.tar.bz2 | |
ENH: add even more search directories for debian-like systems (see #8821)
Alex
| -rw-r--r-- | Modules/FindJNI.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index b5c9fd5..7834d6a 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake @@ -32,7 +32,11 @@ SET(JAVA_AWT_LIBRARY_DIRECTORIES /usr/lib/j2sdk1.4-sun/jre/lib/i386 /usr/lib/j2sdk1.5-sun/jre/lib/i386 /opt/sun-jdk-1.5.0.04/jre/lib/amd64 - /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64 + /usr/lib/jvm/java-6-sun/jre/lib/i386 + /usr/lib/jvm/java-6-sun/jre/lib/amd64 + /usr/lib/jvm/java-1.5.0-sun/jre/lib/i386 + /usr/lib/jvm/java-1.5.0-sun/jre/lib/amd64 + /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/amd64 # can this one be removed according to #8821 ? Alex /usr/lib/java/jre/lib/amd64 /usr/local/lib/java/jre/lib/amd64 /usr/local/share/java/jre/lib/amd64 @@ -66,7 +70,9 @@ SET(JAVA_AWT_INCLUDE_DIRECTORIES /usr/lib/java/include /usr/local/lib/java/include /usr/lib/jvm/java/include - /usr/lib/jvm/java-6-sun-1.6.0.00/include + /usr/lib/jvm/java-6-sun/include + /usr/lib/jvm/java-1.5.0-sun/include + /usr/lib/jvm/java-6-sun-1.6.0.00/include # can this one be removed according to #8821 ? Alex /usr/local/share/java/include /usr/lib/j2sdk1.4-sun/include /usr/lib/j2sdk1.5-sun/include |