diff options
| author | Brad King <brad.king@kitware.com> | 2021-02-24 14:00:59 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-02-25 18:24:54 (GMT) |
| commit | 3e7dd3974777fc9af946d6b7db6ba72abfe4217c (patch) | |
| tree | 0bb42155a4240d767b0c2024cfeba7fe47d633a0 | |
| parent | a133a583d484028f8b03bd791ebea8ba0cf96b84 (diff) | |
| download | CMake-3e7dd3974777fc9af946d6b7db6ba72abfe4217c.zip CMake-3e7dd3974777fc9af946d6b7db6ba72abfe4217c.tar.gz CMake-3e7dd3974777fc9af946d6b7db6ba72abfe4217c.tar.bz2 | |
cmLocalGenerator: Simplify some GetIncludeFlag call sites
The path style argument is meaningful only with the Ninja generator,
so drop it from call sites in Makefile and Xcode generators.
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 9 | ||||
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 37ef4fc..cc075de 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -991,10 +991,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( includes, genexInterpreter.Evaluate(*cincludes, INCLUDE_DIRECTORIES), *sf); } - lg->AppendFlags( - flags, - lg->GetIncludeFlags(includes, gtgt, lang, std::string(), false, - cmLocalGenerator::IncludePathStyle::Absolute)); + lg->AppendFlags(flags, + lg->GetIncludeFlags(includes, gtgt, lang, std::string())); cmXCodeObject* buildFile = this->CreateXCodeBuildFileFromPath(sf->ResolveFullPath(), gtgt, lang, sf); @@ -2698,8 +2696,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, // GNU assembly files (#16449) for (auto const& language : languages) { std::string includeFlags = this->CurrentLocalGenerator->GetIncludeFlags( - includes, gtgt, language, configName, false, - cmLocalGenerator::IncludePathStyle::Absolute); + includes, gtgt, language, configName); if (!includeFlags.empty()) { cflags[language] += " " + includeFlags; diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index 00bf891..fa469ed 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -854,8 +854,7 @@ void cmMakefileTargetGenerator::WriteObjectRuleFiles( vars.Defines = definesString.c_str(); std::string includesString = this->LocalGenerator->GetIncludeFlags( - includes, this->GeneratorTarget, lang, config, false, - cmLocalGenerator::IncludePathStyle::Absolute); + includes, this->GeneratorTarget, lang, config); this->LocalGenerator->AppendFlags(includesString, "$(" + lang + "_INCLUDES)"); vars.Includes = includesString.c_str(); @@ -2197,7 +2196,7 @@ void cmMakefileTargetGenerator::AddIncludeFlags(std::string& flags, std::string includeFlags = this->LocalGenerator->GetIncludeFlags( includes, this->GeneratorTarget, lang, this->GetConfigName(), - useResponseFile, cmLocalGenerator::IncludePathStyle::Default); + useResponseFile); if (includeFlags.empty()) { return; } |