[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-763-g305ef6a

[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  305ef6a006de0fa6ae86752a3a1c96d2570a99f2 (commit)
       via  d0ada3e2183d3f80125795a3b13acafa7cc0c477 (commit)
      from  ffba33ff51b6c0acfe3d16e5632d927d87c5d24b (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=305ef6a006de0fa6ae86752a3a1c96d2570a99f2
commit 305ef6a006de0fa6ae86752a3a1c96d2570a99f2
Merge: ffba33f d0ada3e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 3 08:15:44 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 3 08:15:44 2017 -0500

    Merge topic 'FindJNI-archlinux-jvm-paths' into next
    
    d0ada3e2 FindJNI: Add jvm paths for Arch Linux


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0ada3e2183d3f80125795a3b13acafa7cc0c477
commit d0ada3e2183d3f80125795a3b13acafa7cc0c477
Author:     Kitsu <mail at kitsu.me>
AuthorDate: Fri Mar 3 10:25:37 2017 +0300
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 3 08:14:34 2017 -0500

    FindJNI: Add jvm paths for Arch Linux

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 39e504f..cebba10 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -145,6 +145,9 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib
   /usr/lib/jvm/default-java/lib
+  # Arch Linux specific paths for default JVM
+  /usr/lib/jvm/default/jre/lib/{libarch}
+  /usr/lib/jvm/default/lib/{libarch}
   # Ubuntu specific paths for default JVM
   /usr/lib/jvm/java-8-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
   /usr/lib/jvm/java-7-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
@@ -200,6 +203,8 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
   /opt/sun-jdk-1.5.0.04/include
   # Debian specific path for default JVM
   /usr/lib/jvm/default-java/include
+  # Arch specific path for default JVM
+  /usr/lib/jvm/default/include
   # OpenBSD specific path for default JVM
   /usr/local/jdk-1.7.0/include
   /usr/local/jdk-1.6.0/include

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

Summary of changes:
 Modules/FindJNI.cmake |    5 +++++
 1 file changed, 5 insertions(+)


hooks/post-receive
-- 
CMake