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

ENH: fix for spaces in the path

This commit is contained in:
Andy Cedilnik 2005-02-18 15:45:19 -05:00
parent 94a3e4be53
commit c116bf5f84
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/cmGlobalXCodeGenerator.cxx
View File

@ -230,16 +230,16 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
mf->AddUtilityCommand("install", cmake_command.c_str(), mf->AddUtilityCommand("install", cmake_command.c_str(),
"-P cmake_install.cmake", false, srcs); "-P cmake_install.cmake", false, srcs);
// Add XCODE depend helper // Add XCODE depend helper
std::string dir = this->ConvertToRelativeOutputPath( std::string dir = mf->GetCurrentOutputDirectory();
mf->GetCurrentOutputDirectory());
m_CurrentXCodeHackMakefile = dir; m_CurrentXCodeHackMakefile = dir;
m_CurrentXCodeHackMakefile += "/CMakeScripts"; m_CurrentXCodeHackMakefile += "/CMakeScripts";
cmSystemTools::MakeDirectory(m_CurrentXCodeHackMakefile.c_str()); cmSystemTools::MakeDirectory(m_CurrentXCodeHackMakefile.c_str());
m_CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make"; m_CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
std::string makecommand = "make -C "; std::string makecommand = "make -C ";
makecommand += dir; makecommand += this->ConvertToRelativeOutputPath(dir.c_str());
makecommand += " -f "; makecommand += " -f ";
makecommand += m_CurrentXCodeHackMakefile; makecommand += this->ConvertToRelativeOutputPath(
m_CurrentXCodeHackMakefile.c_str());
mf->AddUtilityCommand("XCODE_DEPEND_HELPER", makecommand.c_str(), mf->AddUtilityCommand("XCODE_DEPEND_HELPER", makecommand.c_str(),
"", "",
false,srcs); false,srcs);
@ -714,7 +714,8 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
std::string makecmd = "make -C "; std::string makecmd = "make -C ";
makecmd += cdir; makecmd += cdir;
makecmd += " -f "; makecmd += " -f ";
makecmd += makefile; makecmd += this->ConvertToRelativeOutputPath(makefile.c_str());
cmSystemTools::ReplaceString(makecmd, "\\ ", "\\\\ ");
buildphase->AddAttribute("shellScript", this->CreateString(makecmd.c_str())); buildphase->AddAttribute("shellScript", this->CreateString(makecmd.c_str()));
} }