[Cmake-commits] CMake branch, next, updated. v2.8.5-1898-gc0c0b10

[Todd Gamblin]

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  c0c0b109c8262bfbdd24cd12c3129a697dc83b2a (commit)
       via  575453a63d7adc5aebaadcc8e85d85128151388e (commit)
      from  29a1f7a018a3f42ea4d8cb98e327e29db02bc7b2 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c0c0b109c8262bfbdd24cd12c3129a697dc83b2a
commit c0c0b109c8262bfbdd24cd12c3129a697dc83b2a
Merge: 29a1f7a 575453a
Author:     Todd Gamblin <tgamblin at llnl.gov>
AuthorDate: Thu Sep 15 13:50:45 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 15 13:50:45 2011 -0400

    Merge topic 'fix-boost-cmake-components' into next
    
    575453a Revert "Find boost components correctly in config mode."


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=575453a63d7adc5aebaadcc8e85d85128151388e
commit 575453a63d7adc5aebaadcc8e85d85128151388e
Author:     Todd Gamblin <tgamblin at llnl.gov>
AuthorDate: Thu Sep 15 10:48:56 2011 -0700
Commit:     Todd Gamblin <tgamblin at llnl.gov>
CommitDate: Thu Sep 15 10:48:56 2011 -0700

    Revert "Find boost components correctly in config mode."
    
    This reverts commit 0d94847066b4b50ef26b0103bdc0e834836a8abe.
    
    This fix is not needed in CMake 2.8.5 and later.
    Don't include in CMake 2.8.6!

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 6a61bde..5ccbd6b 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -279,12 +279,7 @@ if (NOT Boost_NO_BOOST_CMAKE)
   # Do the same find_package call but look specifically for the CMake version.
   # Note that args are passed in the Boost_FIND_xxxxx variables, so there is no
   # need to delegate them to this find_package call.
-  if (Boost_FIND_COMPONENTS)
-    # Have to do the components explicitly because CMake doesn't seem to delegate them properly
-    find_package(Boost QUIET COMPONENTS ${Boost_FIND_COMPONENTS} NO_MODULE)
-  else()
-    find_package(Boost QUIET ${_boost_find_components} NO_MODULE)
-  endif()
+  find_package(Boost QUIET NO_MODULE)
 
   # If we found boost-cmake, then we're done.  Print out what we found.
   # Otherwise let the rest of the module try to find it.

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

Summary of changes:
 Modules/FindBoost.cmake |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake