summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-05-14 14:16:53 -0400
committerBrad King <brad.king@kitware.com>2021-05-17 10:03:43 -0400
commit013ec595c8d6971c568cff4f8e457d90a6e8be88 (patch)
tree3266653b2f5564d256384db3e9541e1a65f31d9c
parent24bfdbcffba42fc0aac6ef3b575bd50a180d26ea (diff)
downloadcmake-013ec595c8d6971c568cff4f8e457d90a6e8be88.tar.gz
cmLocalGenerator: De-duplicate StateSnapshot member
We have the member from the cmOutputConverter parent.
-rw-r--r--Source/cmLocalGenerator.cxx1
-rw-r--r--Source/cmLocalGenerator.h1
-rw-r--r--Source/cmOutputConverter.h5
3 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx
index 4a35909d7d..3b01b1fa57 100644
--- a/Source/cmLocalGenerator.cxx
+++ b/Source/cmLocalGenerator.cxx
@@ -88,7 +88,6 @@ static auto ruleReplaceVars = { "CMAKE_${LANG}_COMPILER",
cmLocalGenerator::cmLocalGenerator(cmGlobalGenerator* gg, cmMakefile* makefile)
: cmOutputConverter(makefile->GetStateSnapshot())
- , StateSnapshot(makefile->GetStateSnapshot())
, DirectoryBacktrace(makefile->GetBacktrace())
{
this->GlobalGenerator = gg;
diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 1f8970f7c3..0d65267566 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -594,7 +594,6 @@ protected:
virtual bool CheckDefinition(std::string const& define) const;
cmMakefile* Makefile;
- cmStateSnapshot StateSnapshot;
cmListFileBacktrace DirectoryBacktrace;
cmGlobalGenerator* GlobalGenerator;
std::map<std::string, std::string> UniqueObjectNamesMap;
diff --git a/Source/cmOutputConverter.h b/Source/cmOutputConverter.h
index f1a8041ba7..c67e74b9be 100644
--- a/Source/cmOutputConverter.h
+++ b/Source/cmOutputConverter.h
@@ -102,6 +102,9 @@ public:
};
static FortranPreprocess GetFortranPreprocess(cm::string_view value);
+protected:
+ cmStateSnapshot StateSnapshot;
+
private:
cmState* GetState() const;
@@ -111,7 +114,5 @@ private:
static bool Shell_ArgumentNeedsQuotes(cm::string_view in, int flags);
static std::string Shell_GetArgument(cm::string_view in, int flags);
- cmStateSnapshot StateSnapshot;
-
bool LinkScriptShell;
};