diff options
| author | Brad King <brad.king@kitware.com> | 2015-02-19 14:32:25 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-02-19 14:32:25 (GMT) |
| commit | d7bc3ff690b65a1b9c06a7858244d027f0020f66 (patch) | |
| tree | 21a6a0c4d5518bd492c2fe987b84e1cd3381a02f | |
| parent | f7fc99cec6a1db6c53dbf5158b2fb95534704b37 (diff) | |
| parent | bce4e20f78bbaa708b621ff1feabcc975ac6345f (diff) | |
| download | CMake-d7bc3ff690b65a1b9c06a7858244d027f0020f66.zip CMake-d7bc3ff690b65a1b9c06a7858244d027f0020f66.tar.gz CMake-d7bc3ff690b65a1b9c06a7858244d027f0020f66.tar.bz2 | |
Merge topic 'FindJNI-awt-arch'
bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
| -rw-r--r-- | Modules/FindJNI.cmake | 1 |
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} ) |