New command: INCLUDE(somefile.txt)

1 files changed, 14 insertions, 35 deletions

diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx
index 104e621..6ff4a53 100644
--- a/Source/cmDSPMakefile.cxx
+++ b/Source/cmDSPMakefile.cxx
@@ -121,38 +121,6 @@ void cmDSPMakefile::CreateSingleDSP(const char *lname, cmTarget &target)
   this->WriteDSPFile(fout,lname,target);
 }
 
-void cmDSPMakefile::WriteDSPBuildRule(std::ostream& fout)
-{
-  std::string dspname = *(m_CreatedProjectNames.end()-1);
-  dspname += ".dsp";
-  std::string makefileIn = "\"";
-  makefileIn += m_Makefile->GetStartDirectory();
-  makefileIn += "/";
-  makefileIn += "CMakeLists.txt\"";
-  std::string dsprule = "\"";
-  dsprule += m_Makefile->GetHomeDirectory();
-  dsprule += "/CMake/Source/CMakeSetupCMD\" ";
-  dsprule += makefileIn;
-  dsprule += " -DSP -H\"";
-  dsprule += m_Makefile->GetHomeDirectory();
-  dsprule += "\" -S\"";
-  dsprule += m_Makefile->GetStartDirectory();
-  dsprule += "\" -O\"";
-  dsprule += m_Makefile->GetStartOutputDirectory();
-  dsprule += "\" -B\"";
-  dsprule += m_Makefile->GetHomeOutputDirectory();
-  dsprule += "\"";
-
-  std::set<std::string> depends;
-  std::set<std::string> outputs;
-  outputs.insert(outputs.begin(), dspname);
-  fout << "# Begin Source File\n\n";
-  fout << "SOURCE=" << makefileIn.c_str() << "\n\n";
-  this->WriteCustomRule(fout, dsprule.c_str(), depends, outputs);
-  fout << "# End Source File\n";
-}
-
-
 void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
 {
   std::string dspname = *(m_CreatedProjectNames.end()-1);
@@ -174,12 +142,12 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
   dsprule += "\" -B\"";
   dsprule += m_Makefile->GetHomeOutputDirectory();
   dsprule += "\"";
-
-  std::vector<std::string> depends;
+  
   std::vector<std::string> outputs;
   outputs.push_back(dspname);
   cmCustomCommand cc(makefileIn.c_str(), dsprule.c_str(),
-                     depends, outputs);
+		     m_Makefile->GetListFiles(), 
+		     outputs);
   sourceGroup.AddCustomCommand(cc);
 }
 
@@ -306,6 +274,17 @@ void cmDSPMakefile::WriteCustomRule(std::ostream& fout,
       {
       fout << "!ELSEIF  \"$(CFG)\" == " << i->c_str() << std::endl;
       }
+
+    // Write out the dependencies (this seems to be the only way to
+    //  get VC6 to actually take these dependencies into account.
+    fout << "USERDEP__HACK= ";
+    for(std::set<std::string>::const_iterator d = depends.begin();
+	d != depends.end(); ++d)
+      {
+	fout << " \"" << d->c_str() << "\"";
+      }
+    fout << "\n";
+
     fout << "# Begin Custom Build\n\n";
     
     // Write a rule for every output generated by this command.