[Cmake-commits] CMake branch, next, updated. v3.2.0-rc1-407-ga5ab0a6

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db (commit)
       via  bce4e20f78bbaa708b621ff1feabcc975ac6345f (commit)
      from  ddcb4f0f656c001fa8081b8e8a04151532c542e6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db
commit a5ab0a69a2a01df8a14a7dfaf060493f4fdb45db
Merge: ddcb4f0 bce4e20
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 18 09:19:35 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 18 09:19:35 2015 -0500

    Merge topic 'FindJNI-awt-arch' into next
    
    bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bce4e20f78bbaa708b621ff1feabcc975ac6345f
commit bce4e20f78bbaa708b621ff1feabcc975ac6345f
Author:     Tiago Stürmer Daitx <tdaitx at gmail.com>
AuthorDate: Wed Feb 18 04:09:41 2015 -0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 18 09:19:17 2015 -0500

    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>).

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}
     )

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake