[Cmake-commits] CMake branch, next, updated. v3.5.0-382-g6ff0e39

[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  6ff0e39f41989d845d9a76511181791966eab28c (commit)
       via  1b029ea91fe95f3fb036b3b60cf68c2883727ca3 (commit)
       via  add2557865923af058334ba64a889842fc2abd05 (commit)
      from  6f92f9c5ead82168eba18ada867b25ce69c37fd3 (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=6ff0e39f41989d845d9a76511181791966eab28c
commit 6ff0e39f41989d845d9a76511181791966eab28c
Merge: 6f92f9c 1b029ea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Mar 9 08:57:38 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Mar 9 08:57:38 2016 -0500

    Merge topic 'FindJNI-ubuntu-paths' into next
    
    1b029ea9 FindJNI: Append path only "if(EXISTS"
    add25578 FindJNI: Add support for Ubuntu 15.10


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b029ea91fe95f3fb036b3b60cf68c2883727ca3
commit 1b029ea91fe95f3fb036b3b60cf68c2883727ca3
Author:     O. Libre <olibre at Lmap.org>
AuthorDate: Tue Mar 8 06:06:20 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 9 08:55:13 2016 -0500

    FindJNI: Append path only "if(EXISTS"

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 467e3d6..8fe8f7a 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -92,10 +92,14 @@ macro(java_append_library_directories _var)
         if(_path MATCHES "{libarch}")
             foreach(_libarch ${_java_libarch})
                 string(REPLACE "{libarch}" "${_libarch}" _newpath "${_path}")
-                list(APPEND ${_var} "${_newpath}")
+                if(EXISTS ${_newpath})
+                    list(APPEND ${_var} "${_newpath}")
+                endif()
             endforeach()
         else()
-            list(APPEND ${_var} "${_path}")
+            if(EXISTS ${_path})
+                list(APPEND ${_var} "${_path}")
+            endif()
         endif()
     endforeach()
 endmacro()

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=add2557865923af058334ba64a889842fc2abd05
commit add2557865923af058334ba64a889842fc2abd05
Author:     O. Libre <olibre at Lmap.org>
AuthorDate: Tue Mar 8 06:02:49 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Mar 9 08:55:13 2016 -0500

    FindJNI: Add support for Ubuntu 15.10
    
    - Reuse JAVA_APPEND_LIBRARY_DIRECTORIES for JAVA_AWT_INCLUDE_DIRECTORIES
    - Append three directories /usr/lib/jvm/java-{8,7,6}-openjdk-{libarch}

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 135038c..467e3d6 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -147,6 +147,9 @@ 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
@@ -181,6 +184,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.4;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\1.3;JavaHome]/include"
   "[HKEY_LOCAL_MACHINE\\SOFTWARE\\JavaSoft\\Java Development Kit\\${java_install_version};JavaHome]/include"
+)
+
+JAVA_APPEND_LIBRARY_DIRECTORIES(JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/include
   /usr/local/include
   /usr/lib/java/include
@@ -190,6 +196,9 @@ list(APPEND JAVA_AWT_INCLUDE_DIRECTORIES
   /usr/lib/jvm/java-1.5.0-sun/include
   /usr/lib/jvm/java-6-sun-1.6.0.00/include       # can this one be removed according to #8821 ? Alex
   /usr/lib/jvm/java-6-openjdk/include
+  /usr/lib/jvm/java-8-openjdk-{libarch}/include  # ubuntu 15.10
+  /usr/lib/jvm/java-7-openjdk-{libarch}/include  # ubuntu 15.10
+  /usr/lib/jvm/java-6-openjdk-{libarch}/include  # ubuntu 15.10
   /usr/local/share/java/include
   /usr/lib/j2sdk1.4-sun/include
   /usr/lib/j2sdk1.5-sun/include

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

Summary of changes:
 Modules/FindJNI.cmake |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake