1 files changed, 10 insertions, 4 deletions
diff --git a/Source/cmCommonTargetGenerator.h b/Source/cmCommonTargetGenerator.h
index 37b6880..2796470 100644
--- a/Source/cmCommonTargetGenerator.h
+++ b/Source/cmCommonTargetGenerator.h
@@ -51,18 +51,24 @@ protected:
   void AppendOSXVerFlag(std::string& flags, const std::string& lang,
                         const char* name, bool so);
 
-  using ByLanguageMap = std::map<std::string, std::string>;
   std::string GetFlags(const std::string& l, const std::string& config);
-  ByLanguageMap FlagsByLanguage;
   std::string GetDefines(const std::string& l, const std::string& config);
-  ByLanguageMap DefinesByLanguage;
   std::string GetIncludes(std::string const& l, const std::string& config);
-  ByLanguageMap IncludesByLanguage;
   std::string GetManifests(const std::string& config);
 
   std::vector<std::string> GetLinkedTargetDirectories(
     const std::string& config) const;
   std::string ComputeTargetCompilePDB(const std::string& config) const;
+
+private:
+  using ByLanguageMap = std::map<std::string, std::string>;
+  struct ByConfig
+  {
+    ByLanguageMap FlagsByLanguage;
+    ByLanguageMap DefinesByLanguage;
+    ByLanguageMap IncludesByLanguage;
+  };
+  std::map<std::string, ByConfig> Configs;
 };
 
 #endif