summaryrefslogtreecommitdiffstats
path: root/Modules/FindJNI.cmake
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-04-12 18:43:59 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-04-12 18:43:59 (GMT)
commitbc888800f5c294bcb2233b2a9d8db2cef43bd744 (patch)
tree5c78e48828d7d497c293e24dd4edc1d24d5dad47 /Modules/FindJNI.cmake
parent0a340142aa721332ff7e7daf757cd429438344c9 (diff)
parenta59d198aa37950fe7048986619c5108384b9deda (diff)
downloadCMake-bc888800f5c294bcb2233b2a9d8db2cef43bd744.zip
CMake-bc888800f5c294bcb2233b2a9d8db2cef43bd744.tar.gz
CMake-bc888800f5c294bcb2233b2a9d8db2cef43bd744.tar.bz2
Merge topic 'fixbug_0011183'
a59d198 Add support for java on fedora
Diffstat (limited to 'Modules/FindJNI.cmake')
-rw-r--r--Modules/FindJNI.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index da24fc0..5921101 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