[cmake-commits] king committed cmGlobalUnixMakefileGenerator3.cxx 1.111 1.112 cmGlobalUnixMakefileGenerator3.h 1.45 1.46

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv13157

Modified Files:
	cmGlobalUnixMakefileGenerator3.cxx 
	cmGlobalUnixMakefileGenerator3.h 
Log Message:
BUG: Removing accidental commit.


Index: cmGlobalUnixMakefileGenerator3.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.cxx,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- cmGlobalUnixMakefileGenerator3.cxx	2 Aug 2007 18:28:00 -0000	1.111
+++ cmGlobalUnixMakefileGenerator3.cxx	2 Aug 2007 18:28:45 -0000	1.112
@@ -731,7 +731,8 @@
       makefileName = localName;
       makefileName += "/build.make";
       
-      bool needRequiresStep = this->NeedRequiresStep(t->second);
+      bool needRequiresStep = 
+        this->NeedRequiresStep(lg,t->second.GetName());
       
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -861,14 +862,11 @@
         lg->WriteMakeRule(ruleFileStream, 
                           "Pre-install relink rule for target.",
                           localName.c_str(), depends, commands, true);
-        if(!exclude)
-          {
-          depends.clear();
-          depends.push_back(localName);
-          commands.clear();
-          lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
-                            "preinstall", depends, commands, true);
-          }
+        depends.clear();
+        depends.push_back(localName);
+        commands.clear();
+        lg->WriteMakeRule(ruleFileStream, "Prepare target for install.",
+                          "preinstall", depends, commands, true);
         }
       
       // add the clean rule
@@ -1170,17 +1168,18 @@
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmTarget const& target)
+::NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg,const char *name)
 {
-  std::set<cmStdString> languages;
-  target.GetLanguages(languages);
-  for(std::set<cmStdString>::const_iterator l = languages.begin();
-      l != languages.end(); ++l)
+  std::map<cmStdString,cmLocalUnixMakefileGenerator3::IntegrityCheckSet>& 
+    checkSet = lg->GetIntegrityCheckSet()[name];
+  for(std::map<cmStdString, 
+        cmLocalUnixMakefileGenerator3::IntegrityCheckSet>::const_iterator
+        l = checkSet.begin(); l != checkSet.end(); ++l)
     {
-    std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
-    var += *l;
-    var += "_FLAG";
-    if(target.GetMakefile()->GetDefinition(var.c_str()))
+    std::string name2 = "CMAKE_NEEDS_REQUIRES_STEP_";
+    name2 += l->first;
+    name2 += "_FLAG";
+    if(lg->GetMakefile()->GetDefinition(name2.c_str()))
       {
       return true;
       }

Index: cmGlobalUnixMakefileGenerator3.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalUnixMakefileGenerator3.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- cmGlobalUnixMakefileGenerator3.h	2 Aug 2007 18:23:46 -0000	1.45
+++ cmGlobalUnixMakefileGenerator3.h	2 Aug 2007 18:28:45 -0000	1.46
@@ -165,7 +165,7 @@
                              cmTarget &target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmTarget const&);
+  bool NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg, const char *);
 
   // Setup target names
   virtual const char* GetAllTargetName()          { return "all"; }