[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-685-gf5287ad

[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  f5287ad5eb7e591396375b4a42cc00061c5d3407 (commit)
       via  10a7459a228f2968681d064486d49942f6d5ecc3 (commit)
      from  01c100d512b1abba64687c4bd5550cba5ac30f9d (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=f5287ad5eb7e591396375b4a42cc00061c5d3407
commit f5287ad5eb7e591396375b4a42cc00061c5d3407
Merge: 01c100d 10a7459
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 14:19:08 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 14:19:08 2016 -0400

    Merge topic 'FindJava-doc-update' into next
    
    10a7459a FindJava: Do not document variables we do not provide


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=10a7459a228f2968681d064486d49942f6d5ecc3
commit 10a7459a228f2968681d064486d49942f6d5ecc3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 14:17:06 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 14:18:21 2016 -0400

    FindJava: Do not document variables we do not provide
    
    Drop Java_INCLUDE_DIRS and Java_LIBRARIES from the documentation since
    we do not provide them.  Also add a link to FindJNI to help users find
    it.  Fixes #16180.

diff --git a/Modules/FindJava.cmake b/Modules/FindJava.cmake
index c643d9b..424ae30 100644
--- a/Modules/FindJava.cmake
+++ b/Modules/FindJava.cmake
@@ -8,6 +8,7 @@
 # include files and libraries are.  The caller may set variable JAVA_HOME
 # to specify a Java installation prefix explicitly.
 #
+# See also the :module:`FindJNI` module to find Java development tools.
 #
 # Specify one or more of the following components as you call this find module. See example below.
 #
@@ -54,8 +55,6 @@
 # ::
 #
 #   Java_FOUND                    - TRUE if all components are found.
-#   Java_INCLUDE_DIRS             - Full paths to all include dirs.
-#   Java_LIBRARIES                - Full paths to all libraries.
 #   Java_<component>_FOUND        - TRUE if <component> is found.
 #
 #

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

Summary of changes:
 Modules/FindJava.cmake |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake