diff options
author | Brad King <brad.king@kitware.com> | 2001-04-09 13:44:29 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2001-04-09 13:44:29 (GMT) |
commit | e7bd5fcd19064480142aae2928189dc822fad47c (patch) | |
tree | 51b21d4bd06ff5b6e53e30c60ad01d0f322cb795 /Source/cmDSPMakefile.cxx | |
parent | 70b14df3f06177a1e65dfc9eb4bb4c0b0938a2a2 (diff) | |
download | CMake-e7bd5fcd19064480142aae2928189dc822fad47c.zip CMake-e7bd5fcd19064480142aae2928189dc822fad47c.tar.gz CMake-e7bd5fcd19064480142aae2928189dc822fad47c.tar.bz2 |
ENH: Added support for spaces in the output directory names. Spaces in the input directory name may work also, but are untested.
Diffstat (limited to 'Source/cmDSPMakefile.cxx')
-rw-r--r-- | Source/cmDSPMakefile.cxx | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/Source/cmDSPMakefile.cxx b/Source/cmDSPMakefile.cxx index 0d8928c..7a5f60a 100644 --- a/Source/cmDSPMakefile.cxx +++ b/Source/cmDSPMakefile.cxx @@ -157,20 +157,23 @@ void cmDSPMakefile::WriteDSPBuildRule(std::ostream& fout) { std::string dspname = *(m_CreatedProjectNames.end()-1); dspname += ".dsp"; - std::string makefileIn = m_Makefile->GetStartDirectory(); + std::string makefileIn = "\""; + makefileIn += m_Makefile->GetStartDirectory(); makefileIn += "/"; - makefileIn += "CMakeLists.txt"; - std::string dsprule = m_Makefile->GetHomeDirectory(); - dsprule += "/CMake/Source/CMakeSetupCMD "; + makefileIn += "CMakeLists.txt\""; + std::string dsprule = "\""; + dsprule += m_Makefile->GetHomeDirectory(); + dsprule += "/CMake/Source/CMakeSetupCMD\" "; dsprule += makefileIn; - dsprule += " -DSP -H"; + dsprule += " -DSP -H\""; dsprule += m_Makefile->GetHomeDirectory(); - dsprule += " -S"; + dsprule += "\" -S\""; dsprule += m_Makefile->GetStartDirectory(); - dsprule += " -O"; + dsprule += "\" -O\""; dsprule += m_Makefile->GetStartOutputDirectory(); - dsprule += " -B"; + dsprule += "\" -B\""; dsprule += m_Makefile->GetHomeOutputDirectory(); + dsprule += "\""; std::set<std::string> depends; std::set<std::string> outputs; @@ -186,20 +189,23 @@ void cmDSPMakefile::AddDSPBuildRule(cmSourceGroup& sourceGroup) { std::string dspname = *(m_CreatedProjectNames.end()-1); dspname += ".dsp"; - std::string makefileIn = m_Makefile->GetStartDirectory(); + std::string makefileIn = "\""; + makefileIn += m_Makefile->GetStartDirectory(); makefileIn += "/"; - makefileIn += "CMakeLists.txt"; - std::string dsprule = m_Makefile->GetHomeDirectory(); - dsprule += "/CMake/Source/CMakeSetupCMD "; + makefileIn += "CMakeLists.txt\""; + std::string dsprule = "\""; + dsprule += m_Makefile->GetHomeDirectory(); + dsprule += "/CMake/Source/CMakeSetupCMD\" "; dsprule += makefileIn; - dsprule += " -DSP -H"; + dsprule += " -DSP -H\""; dsprule += m_Makefile->GetHomeDirectory(); - dsprule += " -S"; + dsprule += "\" -S\""; dsprule += m_Makefile->GetStartDirectory(); - dsprule += " -O"; + dsprule += "\" -O\""; dsprule += m_Makefile->GetStartOutputDirectory(); - dsprule += " -B"; + dsprule += "\" -B\""; dsprule += m_Makefile->GetHomeOutputDirectory(); + dsprule += "\""; std::vector<std::string> depends; std::vector<std::string> outputs; @@ -316,7 +322,7 @@ void cmDSPMakefile::WriteCustomRule(std::ostream& fout, for(std::set<std::string>::const_iterator d = depends.begin(); d != depends.end(); ++d) { - fout << " \"" << d->c_str() << "\""; + fout << " " << d->c_str(); } fout << "\n " << command << "\n\n"; } |