summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-12-01 16:02:29 (GMT)
committerBrad King <brad.king@kitware.com>2021-12-01 16:33:30 (GMT)
commit94a58e502b47c61a71318b18359d505dfafb639a (patch)
tree114d4c42ade17cc99fc94ad88f397c9b480dd1fd /Source/cmLocalGenerator.h
parent29c80aec94b3607f3aae82170f0b3d0804de2aea (diff)
downloadCMake-94a58e502b47c61a71318b18359d505dfafb639a.zip
CMake-94a58e502b47c61a71318b18359d505dfafb639a.tar.gz
CMake-94a58e502b47c61a71318b18359d505dfafb639a.tar.bz2
cmLocalGenerator: Remove unused IncludePathStyle infrastructure
It is unused since commit c564a3e3ff (Ninja: Always compile sources using absolute paths, 2021-05-19, v3.21.0-rc1~129^2), which left behind a FIXME comment to eventually remove it.
Diffstat (limited to 'Source/cmLocalGenerator.h')
-rw-r--r--Source/cmLocalGenerator.h25
1 files changed, 9 insertions, 16 deletions
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 3edf5dc..5793f29 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -179,18 +179,12 @@ public:
bool AppendLWYUFlags(std::string& flags, const cmGeneratorTarget* target,
const std::string& lang);
- enum class IncludePathStyle
- {
- Default,
- Absolute,
- };
-
//! Get the include flags for the current makefile and language
- std::string GetIncludeFlags(
- std::vector<std::string> const& includes, cmGeneratorTarget* target,
- std::string const& lang, std::string const& config,
- bool forResponseFile = false,
- IncludePathStyle pathStyle = IncludePathStyle::Default);
+ std::string GetIncludeFlags(std::vector<std::string> const& includes,
+ cmGeneratorTarget* target,
+ std::string const& lang,
+ std::string const& config,
+ bool forResponseFile = false);
using GeneratorTargetVector =
std::vector<std::unique_ptr<cmGeneratorTarget>>;
@@ -526,12 +520,11 @@ public:
cmValue GetRuleLauncher(cmGeneratorTarget* target, const std::string& prop);
protected:
- // The default implementation ignores the IncludePathStyle and always
- // uses absolute paths. A generator may override this to use relative
- // paths in some cases.
+ // The default implementation converts to a Windows shortpath to
+ // help older toolchains handle spaces and such. A generator may
+ // override this to avoid that conversion.
virtual std::string ConvertToIncludeReference(
- std::string const& path, IncludePathStyle pathStyle,
- cmOutputConverter::OutputFormat format);
+ std::string const& path, cmOutputConverter::OutputFormat format);
//! put all the libraries for a target on into the given stream
void OutputLinkLibraries(cmComputeLinkInformation* pcli,