diff options
| author | Tiago Stürmer Daitx <tdaitx@gmail.com> | 2015-02-18 06:09:41 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-02-18 14:19:17 (GMT) |
| commit | bce4e20f78bbaa708b621ff1feabcc975ac6345f (patch) | |
| tree | 1b54c8e2d054948d6f24b5780fdbca86aa41376d /Modules/FindJNI.cmake | |
| parent | da92cdab5206d0556822ee12350636300ec73160 (diff) | |
| download | CMake-bce4e20f78bbaa708b621ff1feabcc975ac6345f.zip CMake-bce4e20f78bbaa708b621ff1feabcc975ac6345f.tar.gz CMake-bce4e20f78bbaa708b621ff1feabcc975ac6345f.tar.bz2 | |
FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
JDK9's directory structure changes and no jdk/jre exists. The arch
lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).
Diffstat (limited to 'Modules/FindJNI.cmake')
| -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} ) |