Merge branch 'FindJNI-awt-arch' into release

2015-02-18 09:20:24 -05:00 · 2015-02-18 09:20:24 -05:00 · 8371cd7893
parent 9457bf9f40 bce4e20f78
commit 8371cd7893
1 changed files with 1 additions and 0 deletions
--- 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}
    )