diff options
| author | Brad King <brad.king@kitware.com> | 2016-12-05 14:23:22 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-12-05 14:23:22 (GMT) |
| commit | f6f42b25c841d807536ec533a5a738d7dd6f02dd (patch) | |
| tree | 312bacb5e50aef0ad12fb6b19dde00c507b4f0ae /Source/cmServerProtocol.cxx | |
| parent | 8ababa140c13c8a38ac46b2d5feb089b0b3ee25d (diff) | |
| parent | 5dec0a232843d6408ed1a73292126c47a85bd5af (diff) | |
| download | CMake-f6f42b25c841d807536ec533a5a738d7dd6f02dd.zip CMake-f6f42b25c841d807536ec533a5a738d7dd6f02dd.tar.gz CMake-f6f42b25c841d807536ec533a5a738d7dd6f02dd.tar.bz2 | |
Merge topic 'src-COMPILE_FLAGS-genex'
5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 3776538..c08a36b 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -672,8 +672,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; |