summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-02-18 14:20:24 (GMT)
committerBrad King <brad.king@kitware.com>2015-02-18 14:20:24 (GMT)
commit8371cd7893f4a10eefe9f806ce5ac0cdff152b08 (patch)
tree0ca18b927838c34af06c6f2161db79a217c9b048
parent9457bf9f4040f72c2d93da8bfb93d2554f37db17 (diff)
parentbce4e20f78bbaa708b621ff1feabcc975ac6345f (diff)
downloadCMake-8371cd7893f4a10eefe9f806ce5ac0cdff152b08.zip
CMake-8371cd7893f4a10eefe9f806ce5ac0cdff152b08.tar.gz
CMake-8371cd7893f4a10eefe9f806ce5ac0cdff152b08.tar.bz2
Merge branch 'FindJNI-awt-arch' into release
-rw-r--r--Modules/FindJNI.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 3dcb0d0..d248fe1 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -114,6 +114,7 @@ if(_JAVA_HOME)
JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
${_JAVA_HOME}/jre/lib/{libarch}
${_JAVA_HOME}/jre/lib
+ ${_JAVA_HOME}/lib/{libarch}
${_JAVA_HOME}/lib
${_JAVA_HOME}
)