[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3776-gc3163b7

[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  c3163b78b90870bec6fdf31111c774a887e2f009 (commit)
       via  d71568da5b944214740a0c6c69d1eddbb4b4773d (commit)
       via  48539259ef5f7313e8e093ac536d7084a97580f3 (commit)
      from  f846081a5fb62555506644cf3e52f0136a50fcdb (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=c3163b78b90870bec6fdf31111c774a887e2f009
commit c3163b78b90870bec6fdf31111c774a887e2f009
Merge: f846081 d71568d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 8 11:03:14 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 8 11:03:14 2013 -0400

    Merge topic 'fix-compiler-target-with-arg1' into next
    
    d71568d Add missing space before adding the compiler target.
    4853925 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d71568da5b944214740a0c6c69d1eddbb4b4773d
commit d71568da5b944214740a0c6c69d1eddbb4b4773d
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 8 17:01:34 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Aug 8 17:01:34 2013 +0200

    Add missing space before adding the compiler target.
    
    Otherwise, if the compilerArg1 is specified, the compiler target
    is appended to it without any delimiting.

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index b515727..5b69724 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -1074,6 +1074,7 @@ cmLocalGenerator::ExpandRuleVariable(std::string const& variable,
             }
           if (compilerTarget && compilerOptionTarget)
             {
+            ret += " ";
             ret += compilerOptionTarget;
             ret += compilerTarget;
             }

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

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


hooks/post-receive
-- 
CMake