From bce4e20f78bbaa708b621ff1feabcc975ac6345f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20St=C3=BCrmer=20Daitx?= Date: Wed, 18 Feb 2015 04:09:41 -0200 Subject: [PATCH] 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/ (instead of jdk/jre/lib/). --- Modules/FindJNI.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake index 3dcb0d0aaf..d248fe1874 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} )