summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2011-03-28 15:39:27 (GMT)
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2011-04-08 13:12:23 (GMT)
commita59d198aa37950fe7048986619c5108384b9deda (patch)
tree6aca067f84e8b329659ea868e27f941cbb6a8af2
parent0e66141bea25a93a5ef42c39d5c3a0b6612c1fe6 (diff)
downloadCMake-a59d198aa37950fe7048986619c5108384b9deda.zip
CMake-a59d198aa37950fe7048986619c5108384b9deda.tar.gz
CMake-a59d198aa37950fe7048986619c5108384b9deda.tar.bz2
Add support for java on fedora
This commit fixes BUG: 0011183 by adding new paths used on fedora, specifically: /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0
-rw-r--r--Modules/FindJNI.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 6ba1826..cf88764 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -114,6 +114,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/lib/jvm/java-1.5.0-sun/jre/lib/{libarch}
/usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch} # can this one be removed according to #8821 ? Alex
/usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
+ /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch} # fedora
# Debian specific paths for default JVM
/usr/lib/jvm/default-java/jre/lib/{libarch}
/usr/lib/jvm/default-java/jre/lib