[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1445-g21061f2

Ben Boeckel ben.boeckel at kitware.com
Tue Mar 25 16:26:38 EDT 2014


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  21061f26437047b8eaf3ad218d8a921f2e4e1a0f (commit)
       via  f284b003d7eee7345f3daa2893a21ff605ba09a7 (commit)
       via  a56a8f95364e6ec1fc50cb6a792325d914c16235 (commit)
      from  abd7d496b9d418787c226c16af1d6aba9bccaf79 (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=21061f26437047b8eaf3ad218d8a921f2e4e1a0f
commit 21061f26437047b8eaf3ad218d8a921f2e4e1a0f
Merge: abd7d49 f284b00
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 25 16:26:37 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 25 16:26:37 2014 -0400

    Merge topic 'dev/find-boost-graph_parallel' into next
    
    f284b003 FindBoost: Search next to MPI libs for graph_parallel (#14832)
    a56a8f95 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f284b003d7eee7345f3daa2893a21ff605ba09a7
commit f284b003d7eee7345f3daa2893a21ff605ba09a7
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Tue Mar 25 16:22:44 2014 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Tue Mar 25 16:26:11 2014 -0400

    FindBoost: Search next to MPI libs for graph_parallel (#14832)
    
    In addition to the MPI libraries, graph_parallel lives in the MPI libdir
    as well.

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index a57e12c..d4026af 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -954,7 +954,8 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
 
   # Compute component-specific hints.
   set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
-  if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python")
+  if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
+     ${COMPONENT} STREQUAL "graph_parallel")
     foreach(lib ${MPI_CXX_LIBRARIES} ${MPI_C_LIBRARIES})
       if(IS_ABSOLUTE "${lib}")
         get_filename_component(libdir "${lib}" PATH)

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

Summary of changes:
 Modules/FindBoost.cmake   |    3 ++-
 Source/CMakeVersion.cmake |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list