diff options
| author | Marc Chevrier <marc.chevrier@sap.com> | 2017-11-30 14:06:21 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@sap.com> | 2017-12-05 13:47:39 (GMT) |
| commit | 9432f686e62082045f53bd0ec8f8911966476df1 (patch) | |
| tree | 9e03e1ae0c08fa693fbfb741b763d45c78b5feef /Source/cmServerProtocol.cxx | |
| parent | d06b8264212c893b5da8d7499328eb403aaaad37 (diff) | |
| download | CMake-9432f686e62082045f53bd0ec8f8911966476df1.zip CMake-9432f686e62082045f53bd0ec8f8911966476df1.tar.gz CMake-9432f686e62082045f53bd0ec8f8911966476df1.tar.bz2 | |
Add generator expression support to per-source COMPILE_DEFINITIONS
This allows users to specify different genex-based compile definitions for each file in a target.
Fixes: #17508
Diffstat (limited to 'Source/cmServerProtocol.cxx')
| -rw-r--r-- | Source/cmServerProtocol.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Source/cmServerProtocol.cxx b/Source/cmServerProtocol.cxx index 1bb07e7..da354bd 100644 --- a/Source/cmServerProtocol.cxx +++ b/Source/cmServerProtocol.cxx @@ -712,10 +712,16 @@ static Json::Value DumpSourceFilesList( fileData.IncludePathList = ld.IncludePathList; std::set<std::string> defines; - lg->AppendDefines(defines, file->GetProperty("COMPILE_DEFINITIONS")); + if (const char* defs = file->GetProperty("COMPILE_DEFINITIONS")) { + lg->AppendDefines(defines, genexInterpreter.Evaluate(defs)); + } + const std::string defPropName = "COMPILE_DEFINITIONS_" + cmSystemTools::UpperCase(config); - lg->AppendDefines(defines, file->GetProperty(defPropName)); + if (const char* config_defs = file->GetProperty(defPropName)) { + lg->AppendDefines(defines, genexInterpreter.Evaluate(config_defs)); + } + defines.insert(ld.Defines.begin(), ld.Defines.end()); fileData.SetDefines(defines); |