[Cmake-commits] CMake branch, next, updated. v3.6.0-rc4-687-gc101662

[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  c10166242c786deb944855d43c9d38d9ff12f85e (commit)
       via  cb1a434ce093ea2530a7acd5692f4da8cfb9f8aa (commit)
      from  f5287ad5eb7e591396375b4a42cc00061c5d3407 (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=c10166242c786deb944855d43c9d38d9ff12f85e
commit c10166242c786deb944855d43c9d38d9ff12f85e
Merge: f5287ad cb1a434
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jul 5 14:24:39 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jul 5 14:24:39 2016 -0400

    Merge topic 'FindBoost-extras' into next
    
    cb1a434c FindBoost: Add check headers for `zlib` and `bzip2`


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cb1a434ce093ea2530a7acd5692f4da8cfb9f8aa
commit cb1a434ce093ea2530a7acd5692f4da8cfb9f8aa
Author:     Alex Turbov <i.zaufi at gmail.com>
AuthorDate: Fri Jul 1 00:02:34 2016 +0700
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jul 5 14:22:01 2016 -0400

    FindBoost: Add check headers for `zlib` and `bzip2`
    
    The official Windows builds of Boost have internal implementations for
    `zlib` and `bzip2` libraries used by Boost::iostreams library, e.g.
    
    * boost_bzip2-vc140-mt-1_59.lib
    * boost_zlib-vc140-mt-1_59.lib
    
    Add check headers for these so that users can specify them as
    components without any warnings.
    
    Reviewed-by: Roger Leigh <rleigh at dundee.ac.uk>

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 2560459..ed149c6 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -808,6 +808,10 @@ function(_Boost_COMPONENT_HEADERS component _hdrs)
   set(_Boost_UNIT_TEST_FRAMEWORK_HEADERS "boost/test/framework.hpp")
   set(_Boost_WAVE_HEADERS                "boost/wave.hpp")
   set(_Boost_WSERIALIZATION_HEADERS      "boost/archive/text_wiarchive.hpp")
+  if(WIN32)
+    set(_Boost_BZIP2_HEADERS             "boost/iostreams/filter/bzip2.hpp")
+    set(_Boost_ZLIB_HEADERS              "boost/iostreams/filter/zlib.hpp")
+  endif()
 
   string(TOUPPER ${component} uppercomponent)
   set(${_hdrs} ${_Boost_${uppercomponent}_HEADERS} PARENT_SCOPE)

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

Summary of changes:
 Modules/FindBoost.cmake |    4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
CMake