[Cmake-commits] CMake branch, next, updated. v2.8.11.1-2677-g03604c1

[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  03604c1d9729ca23191e38c22c9c4ddea43da7f8 (commit)
       via  86cbd7312a766485eb26219c197b78ae079d44a3 (commit)
       via  7c61c73fbc1c508a6622b444e06c7fc9a0c280f1 (commit)
      from  0f736f09a391fca1eeebce3d5d0257e28d2ab187 (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=03604c1d9729ca23191e38c22c9c4ddea43da7f8
commit 03604c1d9729ca23191e38c22c9c4ddea43da7f8
Merge: 0f736f0 86cbd73
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 20 17:15:53 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 20 17:15:53 2013 -0400

    Merge topic 'FindBoost-error-reason-static' into next
    
    86cbd73 FindBoost: Clarify failure on missing 'static' libs (#14235)
    7c61c73 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=86cbd7312a766485eb26219c197b78ae079d44a3
commit 86cbd7312a766485eb26219c197b78ae079d44a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 20 17:05:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 20 17:10:13 2013 -0400

    FindBoost: Clarify failure on missing 'static' libs (#14235)
    
    When Boost_USE_STATIC_LIBS is ON we may complain that Boost libraries
    cannot be found even when shared libraries are present.  Update the
    error message to tell the user explicitly that we want static libraries.
    
    Suggested-by: Laurence R. McGlashan <laurence.mcglashan at gmail.com>

diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
index d1ce2f4..4cc32be 100644
--- a/Modules/FindBoost.cmake
+++ b/Modules/FindBoost.cmake
@@ -1020,7 +1020,12 @@ if(Boost_FOUND)
     # We were unable to find some libraries, so generate a sensible
     # error message that lists the libraries we were unable to find.
     set(Boost_ERROR_REASON
-      "${Boost_ERROR_REASON}\nThe following Boost libraries could not be found:\n")
+      "${Boost_ERROR_REASON}\nCould not find the following")
+    if(Boost_USE_STATIC_LIBS)
+      set(Boost_ERROR_REASON "${Boost_ERROR_REASON} static")
+    endif()
+    set(Boost_ERROR_REASON
+      "${Boost_ERROR_REASON} Boost libraries:\n")
     foreach(COMPONENT ${_Boost_MISSING_COMPONENTS})
       set(Boost_ERROR_REASON
         "${Boost_ERROR_REASON}        boost_${COMPONENT}\n")

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

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


hooks/post-receive
-- 
CMake