[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-479-g5a31ea4

[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  5a31ea440efecb10bf4489f2022089ae2a7d6afa (commit)
       via  4bb83514147fef6f96635a1e7940ddf568fde228 (commit)
      from  726ec69c205b49f265066664dca65645c04bcbb8 (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=5a31ea440efecb10bf4489f2022089ae2a7d6afa
commit 5a31ea440efecb10bf4489f2022089ae2a7d6afa
Merge: 726ec69 4bb8351
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 21 08:58:16 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jun 21 08:58:16 2016 -0400

    Merge topic 'FindZLIB-fixup' into next
    
    4bb83514 FindZLIB: Do not mark unused variable as advanced


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4bb83514147fef6f96635a1e7940ddf568fde228
commit 4bb83514147fef6f96635a1e7940ddf568fde228
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jun 21 08:56:56 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jun 21 08:56:56 2016 -0400

    FindZLIB: Do not mark unused variable as advanced
    
    We no longer define the ZLIB_LIBRARY cache entry, so we should not mark
    it as advanced either.  We only use this variable when someone else
    defines it in order to remain compatible with older versions of this
    module, but we never create the entry ourselves anymore.

diff --git a/Modules/FindZLIB.cmake b/Modules/FindZLIB.cmake
index a57f450..0b36d6f 100644
--- a/Modules/FindZLIB.cmake
+++ b/Modules/FindZLIB.cmake
@@ -96,7 +96,7 @@ endif()
 unset(ZLIB_NAMES)
 unset(ZLIB_NAMES_DEBUG)
 
-mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
+mark_as_advanced(ZLIB_INCLUDE_DIR)
 
 if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
     file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")

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

Summary of changes:
 Modules/FindZLIB.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake