ENH: Moved unique object file name computation from cmLocalUnixMakefileGenerator3 up to cmLocalGenerator for use by all generators. Created cmLocalVisualStudioGenerator as superclass for all VS generators. Implemented on-demand unique object file name computation for VS 7 generator to avoid slow compiles when all sources are in subdirectories.

1 files changed, 5 insertions, 0 deletions

diff --git a/Source/cmLocalGenerator.h b/Source/cmLocalGenerator.h
index 6e4c60e..49bae5b 100644
--- a/Source/cmLocalGenerator.h
+++ b/Source/cmLocalGenerator.h
@@ -254,6 +254,10 @@ protected:
     std::ostream& os, const char* config,
     std::vector<std::string> const& configurationTypes);
 
+  // Compute object file names.
+  std::string GetObjectFileNameWithoutTarget(const cmSourceFile& source);
+  std::string& CreateSafeUniqueObjectFileName(const char* sin);
+
   cmMakefile *Makefile;
   cmGlobalGenerator *GlobalGenerator;
   // members used for relative path function ConvertToMakefilePath
@@ -267,6 +271,7 @@ protected:
   cmLocalGenerator* Parent;
   std::vector<cmLocalGenerator*> Children;
   std::map<cmStdString, cmStdString> LanguageToIncludeFlags;
+  std::map<cmStdString, cmStdString> UniqueObjectNamesMap;
   bool WindowsShell;
   bool ForceUnixPath;
   bool UseRelativePaths;