[cmake-commits] alex committed cmLocalVisualStudio6Generator.cxx 1.120.4.1 1.120.4.2 cmLocalVisualStudio6Generator.h 1.16.4.1 1.16.4.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-ACC-TargetUsedAsCommand
	cmLocalVisualStudio6Generator.cxx 
	cmLocalVisualStudio6Generator.h 
Log Message:

ENH: add configName argument to CreateTargetRules so it can create the rules
correctly for the different configtypes. Has to be used for configuring the 
project file templates.

Alex


Index: cmLocalVisualStudio6Generator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.h,v
retrieving revision 1.16.4.1
retrieving revision 1.16.4.2
diff -u -d -r1.16.4.1 -r1.16.4.2
--- cmLocalVisualStudio6Generator.h	4 May 2007 20:43:29 -0000	1.16.4.1
+++ cmLocalVisualStudio6Generator.h	4 May 2007 21:17:34 -0000	1.16.4.2
@@ -92,6 +92,7 @@
   void WriteGroup(const cmSourceGroup *sg, cmTarget target,
                   std::ostream &fout, const char *libName);
   std::string CreateTargetRules(cmTarget &target, 
+                                const char* configName, 
                                 const char *libName);
   void ComputeLinkOptions(cmTarget& target, const char* configName,
                           const std::string extraOptions,

Index: cmLocalVisualStudio6Generator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmLocalVisualStudio6Generator.cxx,v
retrieving revision 1.120.4.1
retrieving revision 1.120.4.2
diff -u -d -r1.120.4.1 -r1.120.4.2
--- cmLocalVisualStudio6Generator.cxx	4 May 2007 20:43:29 -0000	1.120.4.1
+++ cmLocalVisualStudio6Generator.cxx	4 May 2007 21:17:34 -0000	1.120.4.2
@@ -769,6 +769,7 @@
 // look for custom rules on a target and collect them together
 std::string 
 cmLocalVisualStudio6Generator::CreateTargetRules(cmTarget &target, 
+                                                 const char* configName, 
                                                  const char * /* libName */)
 {
   std::string customRuleCode = "";
@@ -809,7 +810,7 @@
       }
     customRuleCode += this->ConstructScript(cr->GetCommandLines(),
                                             cr->GetWorkingDirectory(),
-                                            0, 
+                                            configName, 
                                             cr->GetEscapeOldStyle(),
                                             cr->GetEscapeAllowMakeVars(),
                                             "\\\n\t");
@@ -824,7 +825,7 @@
       }
     customRuleCode += this->ConstructScript(cr->GetCommandLines(),
                                             cr->GetWorkingDirectory(),
-                                            0,
+                                            configName,
                                             cr->GetEscapeOldStyle(),
                                             cr->GetEscapeAllowMakeVars(),
                                             "\\\n\t");
@@ -853,7 +854,7 @@
       }
     customRuleCode += this->ConstructScript(cr->GetCommandLines(),
                                             cr->GetWorkingDirectory(),
-                                            0,
+                                            configName,
                                             cr->GetEscapeOldStyle(),
                                             cr->GetEscapeAllowMakeVars(),
                                             "\\\n\t");
@@ -1278,7 +1279,7 @@
 
   // are there any custom rules on the target itself
   // only if the target is a lib or exe
-  std::string customRuleCode = this->CreateTargetRules(target, libName);
+  std::string customRuleCode = this->CreateTargetRules(target, 0, libName);
 
   std::ifstream fin(this->DSPHeaderTemplate.c_str());
   if(!fin)