mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-27 09:29:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'src-COMPILE_FLAGS-genex'

Browse Source 
5dec0a23 server-mode: Fix per-source COMPILE_FLAGS genex evaluation
This commit is contained in:
Brad King
2016-12-05 09:23:22 -05:00
committed by CMake Topic Stage
parent 8ababa140c 5dec0a2328
commit f6f42b25c8
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmServerProtocol.cxx
+2 -1
View File
@@ -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;