summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2011-06-20 19:14:07 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2011-06-20 19:14:07 (GMT)
commitddd6e8ed5531fc0f812717da268e121b55c3e4b8 (patch)
tree40b44a406e133e1170ab63f8c410e3f70f72dd91
parent26c449d1d9abb2c8d6d770b821ab42b86462e6dc (diff)
parent93fc629adc7e90dce2c54592ae9ec0933adf6154 (diff)
downloadCMake-ddd6e8ed5531fc0f812717da268e121b55c3e4b8.zip
CMake-ddd6e8ed5531fc0f812717da268e121b55c3e4b8.tar.gz
CMake-ddd6e8ed5531fc0f812717da268e121b55c3e4b8.tar.bz2
Merge topic 'FindJNI-Fedora-issue-12276'
93fc629 FindJNI: Search in Fedora arch-specific JVM location (#12276)
-rw-r--r--Modules/FindJNI.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 5921101..d49b44a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -105,6 +105,7 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
/usr/local/lib
/usr/lib/jvm/java/lib
/usr/lib/java/jre/lib/{libarch}
+ /usr/lib/jvm/jre/lib/{libarch}
/usr/local/lib/java/jre/lib/{libarch}
/usr/local/share/java/jre/lib/{libarch}
/usr/lib/j2sdk1.4-sun/jre/lib/{libarch}