[Cmake-commits] CMake branch, next, updated. v2.8.5-1894-g8d0aa66

[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  8d0aa669900786515a1716f622809c4fcb6e7606 (commit)
       via  0d94847066b4b50ef26b0103bdc0e834836a8abe (commit)
      from  b561c86f71d3bf27f715a6da9adebbaf54d48bf2 (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=8d0aa669900786515a1716f622809c4fcb6e7606
commit 8d0aa669900786515a1716f622809c4fcb6e7606
Merge: b561c86 0d94847
Author:     Todd Gamblin <tgamblin at llnl.gov>
AuthorDate: Thu Sep 15 03:36:13 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Sep 15 03:36:13 2011 -0400

    Merge topic 'fix-boost-cmake-components' into next
    
    0d94847 Find boost components correctly in config mode.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0d94847066b4b50ef26b0103bdc0e834836a8abe
commit 0d94847066b4b50ef26b0103bdc0e834836a8abe
Author:     Todd Gamblin <tgamblin at llnl.gov>
AuthorDate: Wed Sep 14 22:27:47 2011 -0700
Commit:     Todd Gamblin <tgamblin at llnl.gov>
CommitDate: Thu Sep 15 00:34:30 2011 -0700

    Find boost components correctly in config mode.
    
    CMake doesn't seem to properly delegate the Boost_FIND_COMPONENTS
    variable to subcalls of find_package() like it does other variables.
    This adds a conditional call to work around the problem.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index 5ccbd6b..6a61bde 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -279,7 +279,12 @@ 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.
-  find_package(Boost QUIET NO_MODULE)
+  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()
 
   # 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, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake