[Cmake-commits] CMake branch, master, updated. v3.15.3-977-gc2ead49

[Kitware Robot]

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, master has been updated
       via  c2ead49451cdd29da50954c88d45334694026ad0 (commit)
       via  4d71bea02c5269c7648913e117d0863860139bd4 (commit)
      from  f9a014e2c810799e0c148e44a2237704fdba717d (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=c2ead49451cdd29da50954c88d45334694026ad0
commit c2ead49451cdd29da50954c88d45334694026ad0
Merge: f9a014e 4d71bea
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Sep 10 14:01:52 2019 +0000
Commit:     Kitware Robot <kwrobot at kitware.com>
CommitDate: Tue Sep 10 10:02:00 2019 -0400

    Merge topic 'local-var'
    
    4d71bea02c cmLocalGenerator::AddConfigVariableFlags: optimize string construction
    
    Acked-by: Kitware Robot <kwrobot at kitware.com>
    Merge-request: !3793


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4d71bea02c5269c7648913e117d0863860139bd4
commit 4d71bea02c5269c7648913e117d0863860139bd4
Author:     Rolf Eike Beer <eb at emlix.com>
AuthorDate: Mon Sep 9 08:15:29 2019 +0200
Commit:     Rolf Eike Beer <eb at emlix.com>
CommitDate: Mon Sep 9 08:15:32 2019 +0200

    cmLocalGenerator::AddConfigVariableFlags: optimize string construction

diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 9152e94..93b26ed 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -2089,12 +2089,11 @@ void cmLocalGenerator::AddConfigVariableFlags(std::string& flags,
                                               const std::string& config)
 {
   // Add the flags from the variable itself.
-  std::string flagsVar = var;
-  this->AppendFlags(flags, this->Makefile->GetSafeDefinition(flagsVar));
+  this->AppendFlags(flags, this->Makefile->GetSafeDefinition(var));
   // Add the flags from the build-type specific variable.
   if (!config.empty()) {
-    flagsVar += "_";
-    flagsVar += cmSystemTools::UpperCase(config);
+    const std::string flagsVar =
+      cmStrCat(var, '_', cmSystemTools::UpperCase(config));
     this->AppendFlags(flags, this->Makefile->GetSafeDefinition(flagsVar));
   }
 }

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

Summary of changes:
 Source/cmLocalGenerator.cxx | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake