mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-27 09:29:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: De-duplicate StateSnapshot member

Browse Source 
We have the member from the cmOutputConverter parent.
This commit is contained in:
Brad King
2021-05-14 14:16:53 -04:00
parent 24bfdbcffb
commit 013ec595c8
3 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
-1
View File
@@ -88,7 +88,6 @@ static auto ruleReplaceVars = { "CMAKE_${LANG}_COMPILER",
cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile) cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile)
: cmOutputConverter(makefile->GetStateSnapshot()) : cmOutputConverter(makefile->GetStateSnapshot())
, StateSnapshot(makefile->GetStateSnapshot())
, DirectoryBacktrace(makefile->GetBacktrace()) , DirectoryBacktrace(makefile->GetBacktrace())
{ {
this->GlobalGenerator = gg; this->GlobalGenerator = gg;
Source/cmLocalGenerator.h
-1
View File
@@ -594,7 +594,6 @@ protected:
virtual bool CheckDefinition(std::string const& define) const; virtual bool CheckDefinition(std::string const& define) const;
cmMakefile* Makefile; cmMakefile* Makefile;
cmStateSnapshot StateSnapshot;
cmListFileBacktrace DirectoryBacktrace; cmListFileBacktrace DirectoryBacktrace;
cmGlobalGenerator* GlobalGenerator; cmGlobalGenerator* GlobalGenerator;
std::map<std::string, std::string> UniqueObjectNamesMap; std::map<std::string, std::string> UniqueObjectNamesMap;
Source/cmOutputConverter.h
+3 -2
View File
@@ -102,6 +102,9 @@ public:
}; };
static FortranPreprocess GetFortranPreprocess(cm::string_view value); static FortranPreprocess GetFortranPreprocess(cm::string_view value);
protected:
cmStateSnapshot StateSnapshot;
private: private:
cmState* GetState() const; cmState* GetState() const;
@@ -111,7 +114,5 @@ private:
static bool Shell_ArgumentNeedsQuotes(cm::string_view in, int flags); static bool Shell_ArgumentNeedsQuotes(cm::string_view in, int flags);
static std::string Shell_GetArgument(cm::string_view in, int flags); static std::string Shell_GetArgument(cm::string_view in, int flags);
cmStateSnapshot StateSnapshot;
bool LinkScriptShell; bool LinkScriptShell;
}; };