[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-691-gd2bca35

[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  d2bca3540bcd9d1982a07e9cbf2b4cdef3b10e97 (commit)
       via  4e11c9660ffd91646438bce4c8898fe62e6456bd (commit)
      from  351936c1829419558ee4d2e694b2594b2d79c437 (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=d2bca3540bcd9d1982a07e9cbf2b4cdef3b10e97
commit d2bca3540bcd9d1982a07e9cbf2b4cdef3b10e97
Merge: 351936c 4e11c96
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 14:36:04 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 14:36:04 2016 -0400

    Merge topic 'FindJNI-cleanup' into next
    
    4e11c966 FindJNI: Improve formatting of FPHSA call


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4e11c9660ffd91646438bce4c8898fe62e6456bd
commit 4e11c9660ffd91646438bce4c8898fe62e6456bd
Author:     O Libre <olibre at Lmap.org>
AuthorDate: Sun Jul 3 22:34:43 2016 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 14:35:24 2016 -0400

    FindJNI: Improve formatting of FPHSA call
    
    Pass one argument per line for better readability.

diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake
index 8fe8f7a..d43ec7d 100644
--- a/Modules/FindJNI.cmake
+++ b/Modules/FindJNI.cmake
@@ -311,8 +311,11 @@ else()
 endif()
 
 include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI  DEFAULT_MSG  JAVA_AWT_LIBRARY JAVA_JVM_LIBRARY
-                                                    JAVA_INCLUDE_PATH  JAVA_INCLUDE_PATH2 JAVA_AWT_INCLUDE_PATH)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(JNI  DEFAULT_MSG  JAVA_AWT_LIBRARY
+                                                    JAVA_JVM_LIBRARY
+                                                    JAVA_INCLUDE_PATH
+                                                    JAVA_INCLUDE_PATH2
+                                                    JAVA_AWT_INCLUDE_PATH)
 
 mark_as_advanced(
   JAVA_AWT_LIBRARY

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

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


hooks/post-receive
-- 
CMake