[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-689-g351936c

[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  351936c1829419558ee4d2e694b2594b2d79c437 (commit)
       via  26d16380b077f5a26537fa90f62f90122744bc30 (commit)
      from  c10166242c786deb944855d43c9d38d9ff12f85e (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=351936c1829419558ee4d2e694b2594b2d79c437
commit 351936c1829419558ee4d2e694b2594b2d79c437
Merge: c101662 26d1638
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 14:34:25 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 14:34:25 2016 -0400

    Merge topic 'FindJNI-ubuntu-paths' into next
    
    26d16380 FindJNI: Fix support for Ubuntu 15.10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26d16380b077f5a26537fa90f62f90122744bc30
commit 26d16380b077f5a26537fa90f62f90122744bc30
Author:     O Libre <olibre at Lmap.org>
AuthorDate: Sun Jul 3 20:58:28 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 14:33:46 2016 -0400

    FindJNI: Fix support for Ubuntu 15.10
    
    The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI:
    Add support for Ubuntu 15.10, 2016-03-08) were incorrect.  Fix them.

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 8fe8f7a..3ceab39 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -151,13 +151,14 @@ JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_LIBRARY_DIRECTORIES
   /usr/lib/jvm/java-6-sun-1.6.0.00/jre/lib/{libarch}       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/jre/lib/{libarch}
   /usr/lib/jvm/java-1.6.0-openjdk-1.6.0.0/jre/lib/{libarch}        # fedora
-  /usr/lib/jvm/java-8-openjdk-{libarch}/lib/{libarch}              # ubuntu 15.10
-  /usr/lib/jvm/java-7-openjdk-{libarch}/lib/{libarch}              # ubuntu 15.10
-  /usr/lib/jvm/java-6-openjdk-{libarch}/lib/{libarch}              # ubuntu 15.10
   # Debian specific paths for default JVM
   /usr/lib/jvm/default-java/jre/lib/{libarch}
   /usr/lib/jvm/default-java/jre/lib
   /usr/lib/jvm/default-java/lib
+  # 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
+  /usr/lib/jvm/java-6-openjdk-{libarch}/jre/lib/{libarch}     # Ubuntu 15.10
   # OpenBSD specific paths for default JVM
   /usr/local/jdk-1.7.0/jre/lib/{libarch}
   /usr/local/jre-1.7.0/lib/{libarch}

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

Summary of changes:
 Modules/FindJNI.cmake |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake