kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: Added use of CMAKE cache entry for generating the DSP build rules.

Browse Source
This commit is contained in:
Brad King 2001-05-04 10:44:11 -04:00
parent a0d4003370
commit dec4d7afe1
4 changed files with 4 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmDSPMakefile.cxx
View File

@ -126,38 +126,6 @@ void cmDSPMakefile::CreateSingleDSP(const char *lname, cmTarget &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, makefileIn.c_str(), dsprule.c_str(), depends, outputs);
fout << "# End Source File\n";
}
void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup) void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
{ {
std::string dspname = *(m_CreatedProjectNames.end()-1); std::string dspname = *(m_CreatedProjectNames.end()-1);
@ -166,9 +134,7 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
makefileIn += m_Makefile->GetStartDirectory(); makefileIn += m_Makefile->GetStartDirectory();
makefileIn += "/"; makefileIn += "/";
makefileIn += "CMakeLists.txt\""; makefileIn += "CMakeLists.txt\"";
std::string dsprule = "\""; std::string dsprule = "${CMAKE} ";
dsprule += m_Makefile->GetHomeDirectory();
dsprule += "/CMake/Source/CMakeSetupCMD\" ";
dsprule += makefileIn; dsprule += makefileIn;
dsprule += " -DSP -H\""; dsprule += " -DSP -H\"";
dsprule += m_Makefile->GetHomeDirectory(); dsprule += m_Makefile->GetHomeDirectory();
@ -179,6 +145,7 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
dsprule += "\" -B\""; dsprule += "\" -B\"";
dsprule += m_Makefile->GetHomeOutputDirectory(); dsprule += m_Makefile->GetHomeOutputDirectory();
dsprule += "\""; dsprule += "\"";
m_Makefile->ExpandVariablesInString(dsprule);
std::vector<std::string> outputs; std::vector<std::string> outputs;
outputs.push_back(dspname); outputs.push_back(dspname);

1
Source/cmDSPMakefile.h
View File

@ -102,7 +102,6 @@ private:
void WriteDSPHeader(std::ostream& fout, const char *libName, void WriteDSPHeader(std::ostream& fout, const char *libName,
const cmTarget &tgt); const cmTarget &tgt);
void WriteDSPBuildRule(std::ostream& fout);
void WriteDSPFooter(std::ostream& fout); void WriteDSPFooter(std::ostream& fout);
void AddDSPBuildRule(cmSourceGroup&); void AddDSPBuildRule(cmSourceGroup&);

37
Source/cmDSPWriter.cxx
View File

@ -126,38 +126,6 @@ void cmDSPMakefile::CreateSingleDSP(const char *lname, cmTarget &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, makefileIn.c_str(), dsprule.c_str(), depends, outputs);
fout << "# End Source File\n";
}
void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup) void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
{ {
std::string dspname = *(m_CreatedProjectNames.end()-1); std::string dspname = *(m_CreatedProjectNames.end()-1);
@ -166,9 +134,7 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
makefileIn += m_Makefile->GetStartDirectory(); makefileIn += m_Makefile->GetStartDirectory();
makefileIn += "/"; makefileIn += "/";
makefileIn += "CMakeLists.txt\""; makefileIn += "CMakeLists.txt\"";
std::string dsprule = "\""; std::string dsprule = "${CMAKE} ";
dsprule += m_Makefile->GetHomeDirectory();
dsprule += "/CMake/Source/CMakeSetupCMD\" ";
dsprule += makefileIn; dsprule += makefileIn;
dsprule += " -DSP -H\""; dsprule += " -DSP -H\"";
dsprule += m_Makefile->GetHomeDirectory(); dsprule += m_Makefile->GetHomeDirectory();
@ -179,6 +145,7 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup)
dsprule += "\" -B\""; dsprule += "\" -B\"";
dsprule += m_Makefile->GetHomeOutputDirectory(); dsprule += m_Makefile->GetHomeOutputDirectory();
dsprule += "\""; dsprule += "\"";
m_Makefile->ExpandVariablesInString(dsprule);
std::vector<std::string> outputs; std::vector<std::string> outputs;
outputs.push_back(dspname); outputs.push_back(dspname);

1
Source/cmDSPWriter.h
View File

@ -102,7 +102,6 @@ private:
void WriteDSPHeader(std::ostream& fout, const char *libName, void WriteDSPHeader(std::ostream& fout, const char *libName,
const cmTarget &tgt); const cmTarget &tgt);
void WriteDSPBuildRule(std::ostream& fout);
void WriteDSPFooter(std::ostream& fout); void WriteDSPFooter(std::ostream& fout);
void AddDSPBuildRule(cmSourceGroup&); void AddDSPBuildRule(cmSourceGroup&);