diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-14 14:00:00 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2020-04-14 14:57:17 (GMT) |
| commit | e64fa5f1b611353522ec014192046ab3bf67e69f (patch) | |
| tree | ee490543c83bc3dea5144ab8971caa661f5b633c /Source/cmFileAPICodemodel.cxx | |
| parent | fc223f986066496654b4f2e392a40264c95cbd68 (diff) | |
| download | CMake-e64fa5f1b611353522ec014192046ab3bf67e69f.zip CMake-e64fa5f1b611353522ec014192046ab3bf67e69f.tar.gz CMake-e64fa5f1b611353522ec014192046ab3bf67e69f.tar.bz2 | |
cmSourceFile::GetProperty: return cmProp
Diffstat (limited to 'Source/cmFileAPICodemodel.cxx')
| -rw-r--r-- | Source/cmFileAPICodemodel.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmFileAPICodemodel.cxx b/Source/cmFileAPICodemodel.cxx index 70f5847..f4237cb 100644 --- a/Source/cmFileAPICodemodel.cxx +++ b/Source/cmFileAPICodemodel.cxx @@ -855,8 +855,8 @@ CompileData Target::BuildCompileData(cmSourceFile* sf) fd.Language); const std::string COMPILE_FLAGS("COMPILE_FLAGS"); - if (const char* cflags = sf->GetProperty(COMPILE_FLAGS)) { - std::string flags = genexInterpreter.Evaluate(cflags, COMPILE_FLAGS); + if (cmProp cflags = sf->GetProperty(COMPILE_FLAGS)) { + std::string flags = genexInterpreter.Evaluate(*cflags, COMPILE_FLAGS); fd.Flags.emplace_back(std::move(flags), JBTIndex()); } const std::string COMPILE_OPTIONS("COMPILE_OPTIONS"); @@ -949,10 +949,10 @@ CompileData Target::BuildCompileData(cmSourceFile* sf) std::set<std::string> configFileDefines; const std::string defPropName = "COMPILE_DEFINITIONS_" + cmSystemTools::UpperCase(this->Config); - if (const char* config_defs = sf->GetProperty(defPropName)) { + if (cmProp config_defs = sf->GetProperty(defPropName)) { lg->AppendDefines( configFileDefines, - genexInterpreter.Evaluate(config_defs, COMPILE_DEFINITIONS)); + genexInterpreter.Evaluate(*config_defs, COMPILE_DEFINITIONS)); } fd.Defines.reserve(fileDefines.size() + configFileDefines.size()); |