[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3800-g96dc153

[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  96dc153c84c6d4c9bd2e6bb09de8ea61ef0e7d8e (commit)
       via  dbfdf2fb06445fcc3caf7b3b5fe8d877cdcd4034 (commit)
      from  4cd5fdf10894e1a0165bf3a062e426bbfd4ab02a (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=96dc153c84c6d4c9bd2e6bb09de8ea61ef0e7d8e
commit 96dc153c84c6d4c9bd2e6bb09de8ea61ef0e7d8e
Merge: 4cd5fdf dbfdf2f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 8 13:48:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 8 13:48:29 2013 -0400

    Merge topic 'fix-COMPILER_TARGET-with-arg1' into next
    
    dbfdf2f Fix CMAKE_<LANG>_COMPILER_TARGET with CMAKE_<LANG>_COMPILER_ARG1


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dbfdf2fb06445fcc3caf7b3b5fe8d877cdcd4034
commit dbfdf2fb06445fcc3caf7b3b5fe8d877cdcd4034
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Aug 8 17:01:34 2013 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 8 13:46:44 2013 -0400

    Fix CMAKE_<LANG>_COMPILER_TARGET with CMAKE_<LANG>_COMPILER_ARG1
    
    In commit 2d9ec1da (Add compiler target compile options, 2013-05-19)
    we taught cmLocalGenerator::ExpandRuleVariable to implement the
    CMAKE_<LANG>_COMPILER_TARGET setting by adding the appropriate flag.
    Fix the case when compilerArg1 is set to separate the target flag
    from the preceding flags by a space.

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:


hooks/post-receive
-- 
CMake