[Cmake-commits] CMake branch, next, updated. v3.7.0-1137-gaef8218

[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  aef8218ab7e063d209ef236c3caa9d6cc5ec9dbb (commit)
       via  de7083f3c0bdc9c0af0d35c44afde86aab6d6622 (commit)
      from  3c0ece3d42f9251457ff3358aa2626d99fb32532 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=aef8218ab7e063d209ef236c3caa9d6cc5ec9dbb
commit aef8218ab7e063d209ef236c3caa9d6cc5ec9dbb
Merge: 3c0ece3 de7083f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Nov 14 11:46:48 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Nov 14 11:46:48 2016 -0500

    Merge topic 'ninja-comment-ComputeLinkCmd' into next
    
    de7083f3 Ninja: Document why ComputeLinkCmd is structured the way it is.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=de7083f3c0bdc9c0af0d35c44afde86aab6d6622
commit de7083f3c0bdc9c0af0d35c44afde86aab6d6622
Author:     Robert Maynard <robert.maynard at kitware.com>
AuthorDate: Mon Nov 14 11:39:23 2016 -0500
Commit:     Robert Maynard <robert.maynard at kitware.com>
CommitDate: Mon Nov 14 11:39:23 2016 -0500

    Ninja: Document why ComputeLinkCmd is structured the way it is.

diff --git a/Source/cmNinjaNormalTargetGenerator.cxx b/Source/cmNinjaNormalTargetGenerator.cxx
index a23e0ad..3598914 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -332,6 +332,9 @@ std::vector<std::string> cmNinjaNormalTargetGenerator::ComputeLinkCmd()
   std::vector<std::string> linkCmds;
   cmMakefile* mf = this->GetMakefile();
   {
+    // If we have a rule variable prefer it. In the case of static libraries
+    // this occurs when things like IPO is enabled, and we need to use the
+    // CMAKE_<lang>_CREATE_STATIC_LIBRARY_IPO define instead.
     std::string linkCmdVar = this->GetGeneratorTarget()->GetCreateRuleVariable(
       this->TargetLinkLanguage, this->GetConfigName());
     const char* linkCmd = mf->GetDefinition(linkCmdVar);

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

Summary of changes:
 Source/cmNinjaNormalTargetGenerator.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake