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  70184a7716b16cef891d80d57c506571aa6d2744 (commit)
       via  2f79b22ce049a15e4d4190bbe5e80a3bad9492e8 (commit)
       via  33cb0173d5ebcde2a8621edaa66f8401133d5cc9 (commit)
       via  933e54d3ccf59fd756997752a041ee84e5f85897 (commit)
      from  4edd6e2a616a192b207268dc6bf2d9d3bf7a3031 (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=70184a7716b16cef891d80d57c506571aa6d2744
commit 70184a7716b16cef891d80d57c506571aa6d2744
Merge: 4edd6e2 2f79b22
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 13 13:38:22 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Oct 13 13:38:22 2016 -0400

    Merge topic 'LINK_WHAT_YOU_USE-allow-OFF' into next
    
    2f79b22c Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into 
LINK_WHAT_YOU_USE-allow-OFF
    33cb0173 Honor LINK_WHAT_YOU_USE when set to OFF
    933e54d3 Honor LINK_WHAT_YOU_USE when set to OFF


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2f79b22ce049a15e4d4190bbe5e80a3bad9492e8
commit 2f79b22ce049a15e4d4190bbe5e80a3bad9492e8
Merge: 33cb017 933e54d
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Thu Oct 13 13:35:40 2016 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 13 13:35:40 2016 -0400

    Merge branch 'backport-LINK_WHAT_YOU_USE-allow-OFF' into 
LINK_WHAT_YOU_USE-allow-OFF


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=33cb0173d5ebcde2a8621edaa66f8401133d5cc9
commit 33cb0173d5ebcde2a8621edaa66f8401133d5cc9
Author:     Jamie Snape <jamie.sn...@kitware.com>
AuthorDate: Wed Oct 12 18:15:35 2016 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 13 13:34:35 2016 -0400

    Honor LINK_WHAT_YOU_USE when set to OFF
    
    Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property
    LINK_WHAT_YOU_USE to OFF should not cause LWYU to run.  Fix the
    property lookup to use GetPropertyAsBool.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx 
b/Source/cmMakefileExecutableTargetGenerator.cxx
index bfc4857..ed34ce6 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -198,7 +198,7 @@ void 
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                     this->LocalGenerator->GetLinkLibsCMP0065(
                                       linkLanguage, *this->GeneratorTarget));
 
-  if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+  if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     this->LocalGenerator->AppendFlags(linkFlags, " -Wl,--no-as-needed");
   }
 
@@ -375,7 +375,7 @@ void 
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     vars.LinkFlags = linkFlags.c_str();
     vars.Manifests = manifests.c_str();
 
-    if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+    if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
       std::string cmakeCommand = this->LocalGenerator->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       cmakeCommand += " -E __run_iwyu --lwyu=";
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx 
b/Source/cmMakefileLibraryTargetGenerator.cxx
index 4488f06..860b912 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -168,7 +168,7 @@ void 
cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
 
   this->AddModuleDefinitionFlag(linkLineComputer.get(), extraFlags);
 
-  if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+  if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     this->LocalGenerator->AppendFlags(extraFlags, " -Wl,--no-as-needed");
   }
   this->WriteLibraryRules(linkRuleVar, extraFlags, relink);
@@ -660,7 +660,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
       // Get the set of commands.
       std::string linkRule = this->GetLinkRule(linkRuleVar);
       cmSystemTools::ExpandListArgument(linkRule, real_link_commands);
-      if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE") &&
+      if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE") &&
           (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY)) {
         std::string cmakeCommand = this->LocalGenerator->ConvertToOutputFormat(
           cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx 
b/Source/cmNinjaNormalTargetGenerator.cxx
index ab086eb..34fad9d 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -316,7 +316,7 @@ std::vector<std::string> 
cmNinjaNormalTargetGenerator::ComputeLinkCmd()
     const char* linkCmd = mf->GetDefinition(linkCmdVar);
     if (linkCmd) {
       cmSystemTools::ExpandListArgument(linkCmd, linkCmds);
-      if (this->GetGeneratorTarget()->GetProperty("LINK_WHAT_YOU_USE")) {
+      if (this->GetGeneratorTarget()->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
         std::string cmakeCommand =
           this->GetLocalGenerator()->ConvertToOutputFormat(
             cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -512,7 +512,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   vars["LINK_PATH"] = frameworkPath + linkPath;
   std::string lwyuFlags;
-  if (genTarget.GetProperty("LINK_WHAT_YOU_USE")) {
+  if (genTarget.GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     lwyuFlags = " -Wl,--no-as-needed";
   }
 

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=933e54d3ccf59fd756997752a041ee84e5f85897
commit 933e54d3ccf59fd756997752a041ee84e5f85897
Author:     Jamie Snape <jamie.sn...@kitware.com>
AuthorDate: Wed Oct 12 18:15:35 2016 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Thu Oct 13 13:32:22 2016 -0400

    Honor LINK_WHAT_YOU_USE when set to OFF
    
    Explicitly setting variable CMAKE_LINK_WHAT_YOU_USE or property
    LINK_WHAT_YOU_USE to OFF should not cause LWYU to run.  Fix the
    property lookup to use GetPropertyAsBool.

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx 
b/Source/cmMakefileExecutableTargetGenerator.cxx
index cb20117..4a6990e 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -192,7 +192,7 @@ void 
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     this->LocalGenerator->AppendFlags(
       linkFlags, this->Makefile->GetDefinition(export_flag_var));
   }
-  if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+  if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     this->LocalGenerator->AppendFlags(linkFlags, " -Wl,--no-as-needed");
   }
 
@@ -354,7 +354,7 @@ void 
cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     vars.LinkFlags = linkFlags.c_str();
     vars.Manifests = manifests.c_str();
 
-    if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+    if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
       std::string cmakeCommand = this->LocalGenerator->ConvertToOutputFormat(
         cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
       cmakeCommand += " -E __run_iwyu --lwyu=";
diff --git a/Source/cmMakefileLibraryTargetGenerator.cxx 
b/Source/cmMakefileLibraryTargetGenerator.cxx
index b969bfb..2b1d7cc 100644
--- a/Source/cmMakefileLibraryTargetGenerator.cxx
+++ b/Source/cmMakefileLibraryTargetGenerator.cxx
@@ -161,7 +161,7 @@ void 
cmMakefileLibraryTargetGenerator::WriteSharedLibraryRules(bool relink)
     extraFlags, "CMAKE_SHARED_LINKER_FLAGS", this->ConfigName);
   this->AddModuleDefinitionFlag(extraFlags);
 
-  if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE")) {
+  if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     this->LocalGenerator->AppendFlags(extraFlags, " -Wl,--no-as-needed");
   }
   this->WriteLibraryRules(linkRuleVar, extraFlags, relink);
@@ -638,7 +638,7 @@ void cmMakefileLibraryTargetGenerator::WriteLibraryRules(
       // Get the set of commands.
       std::string linkRule = this->GetLinkRule(linkRuleVar);
       cmSystemTools::ExpandListArgument(linkRule, real_link_commands);
-      if (this->GeneratorTarget->GetProperty("LINK_WHAT_YOU_USE") &&
+      if (this->GeneratorTarget->GetPropertyAsBool("LINK_WHAT_YOU_USE") &&
           (this->GeneratorTarget->GetType() == cmState::SHARED_LIBRARY)) {
         std::string cmakeCommand = this->LocalGenerator->ConvertToOutputFormat(
           cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
diff --git a/Source/cmNinjaNormalTargetGenerator.cxx 
b/Source/cmNinjaNormalTargetGenerator.cxx
index 095c703..5b56813 100644
--- a/Source/cmNinjaNormalTargetGenerator.cxx
+++ b/Source/cmNinjaNormalTargetGenerator.cxx
@@ -315,7 +315,7 @@ std::vector<std::string> 
cmNinjaNormalTargetGenerator::ComputeLinkCmd()
     const char* linkCmd = mf->GetDefinition(linkCmdVar);
     if (linkCmd) {
       cmSystemTools::ExpandListArgument(linkCmd, linkCmds);
-      if (this->GetGeneratorTarget()->GetProperty("LINK_WHAT_YOU_USE")) {
+      if (this->GetGeneratorTarget()->GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
         std::string cmakeCommand =
           this->GetLocalGenerator()->ConvertToOutputFormat(
             cmSystemTools::GetCMakeCommand(), cmLocalGenerator::SHELL);
@@ -505,7 +505,7 @@ void cmNinjaNormalTargetGenerator::WriteLinkStatement()
 
   vars["LINK_PATH"] = frameworkPath + linkPath;
   std::string lwyuFlags;
-  if (genTarget.GetProperty("LINK_WHAT_YOU_USE")) {
+  if (genTarget.GetPropertyAsBool("LINK_WHAT_YOU_USE")) {
     lwyuFlags = " -Wl,--no-as-needed";
   }
 

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

Summary of changes:
 Source/cmMakefileExecutableTargetGenerator.cxx |    4 ++--
 Source/cmMakefileLibraryTargetGenerator.cxx    |    4 ++--
 Source/cmNinjaNormalTargetGenerator.cxx        |    4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to