ENH: Added cmTarget::GetLanguages method to centralize computation of the list of languages compiled in a target.

2 files changed, 12 insertions, 14 deletions

diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx
index 6945b0d..8d528a4 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.cxx
+++ b/Source/cmGlobalUnixMakefileGenerator3.cxx
@@ -731,8 +731,7 @@ cmGlobalUnixMakefileGenerator3
       makefileName = localName;
       makefileName += "/build.make";
       
-      bool needRequiresStep = 
-        this->NeedRequiresStep(lg,t->second.GetName());
+      bool needRequiresStep = this->NeedRequiresStep(t->second);
       
       lg->WriteDivider(ruleFileStream);
       ruleFileStream
@@ -851,7 +850,7 @@ cmGlobalUnixMakefileGenerator3
                         t->second.GetName(), depends, commands, true);
       
       // Add rules to prepare the target for installation.
-      if(t->second.NeedRelinkBeforeInstall())
+      if(!exclude && t->second.NeedRelinkBeforeInstall())
         {
         localName = lg->GetRelativeTargetDirectory(t->second);
         localName += "/preinstall";
@@ -1168,18 +1167,17 @@ void cmGlobalUnixMakefileGenerator3::WriteHelpRule
 
 
 bool cmGlobalUnixMakefileGenerator3
-::NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg,const char *name)
+::NeedRequiresStep(cmTarget const& target)
 {
-  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::set<cmStdString> languages;
+  target.GetLanguages(languages);
+  for(std::set<cmStdString>::const_iterator l = languages.begin();
+      l != languages.end(); ++l)
     {
-    std::string name2 = "CMAKE_NEEDS_REQUIRES_STEP_";
-    name2 += l->first;
-    name2 += "_FLAG";
-    if(lg->GetMakefile()->GetDefinition(name2.c_str()))
+    std::string var = "CMAKE_NEEDS_REQUIRES_STEP_";
+    var += *l;
+    var += "_FLAG";
+    if(target.GetMakefile()->GetDefinition(var.c_str()))
       {
       return true;
       }
diff --git a/Source/cmGlobalUnixMakefileGenerator3.h b/Source/cmGlobalUnixMakefileGenerator3.h
index 512618e..56c4994 100644
--- a/Source/cmGlobalUnixMakefileGenerator3.h
+++ b/Source/cmGlobalUnixMakefileGenerator3.h
@@ -165,7 +165,7 @@ protected:
                              cmTarget &target);
 
   // does this generator need a requires step for any of its targets
-  bool NeedRequiresStep(cmLocalUnixMakefileGenerator3 *lg, const char *);
+  bool NeedRequiresStep(cmTarget const&);
 
   // Setup target names
   virtual const char* GetAllTargetName()          { return "all"; }