[Cmake-commits] CMake branch, next, updated. v2.8.11-2326-g5117741

[Stephen Kelly]

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  511774171f6bab24f83985dbb10728acba910791 (commit)
       via  e5375442ff20fde45e70de318c5aa2f1e4bb190a (commit)
      from  8bd932fabb2584c060ac654f643283cb4ff7a84e (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=511774171f6bab24f83985dbb10728acba910791
commit 511774171f6bab24f83985dbb10728acba910791
Merge: 8bd932f e537544
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 07:51:05 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu May 30 07:51:05 2013 -0400

    Merge topic 'fix-try_compile-library-spaces' into next
    
    e537544 try_compile: Trim whitespace from LINK_LIBRARIES entries


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e5375442ff20fde45e70de318c5aa2f1e4bb190a
commit e5375442ff20fde45e70de318c5aa2f1e4bb190a
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu May 30 13:42:47 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu May 30 13:50:37 2013 +0200

    try_compile: Trim whitespace from LINK_LIBRARIES entries
    
    Commit e65ef08b (try_compile: Fix quoting of libraries in generated
    CMakeLists.txt, 2013-05-24) added quoting to entries specified in
    the LINK_LIBRARIES. However, if the input entries contain whitespace
    padding, that quoted whitespace causes an error in the generated
    CMakeLists.txt at target_link_libraries.
    
    Strictly, it is an error to have space separated entries in the
    CMAKE_REQUIRED_LIBRARIES, as it was never properly handled by
    CMakeExpandImportedTargets even prior to commit 236133e7 (Handle
    targets in the LINK_LIBRARIES of try_compile., 2013-02-09). However,
    it is causing a regression in KDE code which tests the next branch.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index ebfcae0..85e49a9 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -111,7 +111,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
           ++i)
         {
         extraArgs++;
-        libsToLink += "\"" + argv[i] + "\" ";
+        libsToLink += "\"" + cmSystemTools::TrimWhitespace(argv[i]) + "\" ";
         cmTarget *tgt = this->Makefile->FindTargetToUse(argv[i].c_str());
         if (!tgt)
           {

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

Summary of changes:
 Source/cmCoreTryCompile.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake