[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3815-ga9d330e

[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  a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453 (commit)
       via  3bca16bfa1c5784c81b2c07c1910cd9a88519424 (commit)
      from  25b877751e27d13a59534580cd934eb5263f9617 (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=a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453
commit a9d330e09a9f17fcac63ed0af3ac14b2fbf2d453
Merge: 25b8777 3bca16b
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 9 08:27:59 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 9 08:27:59 2013 -0400

    Merge topic 'fix-COMPILER_TARGET-with-arg1' into next
    
    3bca16b Revert "Fix CMAKE_<LANG>_COMPILER_TARGET with CMAKE_<LANG>_COMPILER_ARG1"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3bca16bfa1c5784c81b2c07c1910cd9a88519424
commit 3bca16bfa1c5784c81b2c07c1910cd9a88519424
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri Aug 9 14:27:24 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri Aug 9 14:27:24 2013 +0200

    Revert "Fix CMAKE_<LANG>_COMPILER_TARGET with CMAKE_<LANG>_COMPILER_ARG1"
    
    This reverts commit dbfdf2fb06445fcc3caf7b3b5fe8d877cdcd4034.

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

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

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


hooks/post-receive
-- 
CMake