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 /Source/cmMakefileTargetGenerator.cxx | |
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.
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
-rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
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; } |