diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 75c2fb8134..b240924b66 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -943,7 +943,7 @@ void cmGlobalUnixMakefileGenerator3::InitializeProgressMarks()
         {
         // This local generator includes the target.
         std::set<cmGeneratorTarget const*>& targetSet =
-          this->DirectoryTargetsMap[clg];
+          this->DirectoryTargetsMap[clg->GetStateSnapshot()];
         targetSet.insert(gt);
 
         // Add dependencies of the included target.  An excluded
@@ -992,7 +992,7 @@ cmGlobalUnixMakefileGenerator3
   size_t count = 0;
   std::set<cmGeneratorTarget const*> emitted;
   std::set<cmGeneratorTarget const*> const& targets
-                                        = this->DirectoryTargetsMap[lg];
+      = this->DirectoryTargetsMap[lg->GetStateSnapshot()];
   for(std::set<cmGeneratorTarget const*>::const_iterator t = targets.begin();
       t != targets.end(); ++t)
     {
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 7601cc48a5..c738c1664e 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -207,8 +207,9 @@ private:
   virtual const char* GetBuildIgnoreErrorsFlag() const { return "-i"; }
   virtual std::string GetEditCacheCommand() const;
 
-  std::map<cmLocalGenerator*, std::set<cmGeneratorTarget const*> >
-                                                    DirectoryTargetsMap;
+  std::map<cmState::Snapshot,
+           std::set<cmGeneratorTarget const*>,
+           cmState::Snapshot::StrictWeakOrder> DirectoryTargetsMap;
   virtual void InitializeProgressMarks();
 };