[Cmake-commits] CMake branch, next, updated. v3.7.1-1479-g1eb9514

[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  1eb9514b34b5636ee372dae0d06944768432b0f6 (commit)
       via  5dec0a232843d6408ed1a73292126c47a85bd5af (commit)
      from  70616dc970a34f4a088862ebcda5ad73da065945 (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=1eb9514b34b5636ee372dae0d06944768432b0f6
commit 1eb9514b34b5636ee372dae0d06944768432b0f6
Merge: 70616dc 5dec0a2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 2 10:22:02 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 2 10:22:02 2016 -0500

    Merge topic 'src-COMPILE_FLAGS-genex' into next
    
    5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5dec0a232843d6408ed1a73292126c47a85bd5af
commit 5dec0a232843d6408ed1a73292126c47a85bd5af
Author:     Tobias Hunger <tobias.hunger at qt.io>
AuthorDate: Fri Dec 2 12:21:56 2016 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Dec 2 10:15:50 2016 -0500

    server-mode: Fix per-source COMPILE_FLAGS genex evaluation
    
    Logic added by commit 1e4bb358 (Add generator expression support to
    per-source COMPILE_FLAGS, 2016-10-25) accidentally frees memory before
    finishing with it.  Revise the logic to hold the memory long enough.

diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx
index 00dc0b5..e899190 100644
--- a/Source/cmServerProtocol.cxx
+++ b/Source/cmServerProtocol.cxx
@@ -688,8 +688,9 @@ static Json::Value DumpSourceFilesList(
       std::string compileFlags = ld.Flags;
       if (const char* cflags = file->GetProperty("COMPILE_FLAGS")) {
         cmGeneratorExpression ge;
+        auto cge = ge.Parse(cflags);
         const char* processed =
-          ge.Parse(cflags)->Evaluate(target->GetLocalGenerator(), config);
+          cge->Evaluate(target->GetLocalGenerator(), config);
         lg->AppendFlags(compileFlags, processed);
       }
       fileData.Flags = compileFlags;

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

Summary of changes:
 Source/cmServerProtocol.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake