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

COMP: remove warning

Browse Source
This commit is contained in:
Bill Hoffman 2005-02-18 14:32:55 -05:00
parent 4aab13b710
commit c60cf6585d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/cmGlobalXCodeGenerator.cxx
View File

@ -233,6 +233,8 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
std::string dir = this->ConvertToRelativeOutputPath( std::string dir = this->ConvertToRelativeOutputPath(
mf->GetCurrentOutputDirectory()); mf->GetCurrentOutputDirectory());
m_CurrentXCodeHackMakefile = dir; m_CurrentXCodeHackMakefile = dir;
m_CurrentXCodeHackMakefile += "/CMakeScripts";
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 += dir;
@ -326,8 +328,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
{ {
std::string flags; std::string flags;
// Add flags from source file properties. // Add flags from source file properties.
m_CurrentLocalGenerator lg->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
cmXCodeObject* fileRef = this->CreateObject(cmXCodeObject::PBXFileReference); cmXCodeObject* fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
m_SourcesGroupChildren->AddObject(fileRef); m_SourcesGroupChildren->AddObject(fileRef);
@ -628,8 +629,10 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
const & commands, const & commands,
const char* name) const char* name)
{ {
std::string makefile = m_CurrentMakefile->GetCurrentOutputDirectory(); std::string dir = m_CurrentMakefile->GetCurrentOutputDirectory();
cmSystemTools::MakeDirectory(makefile.c_str()); dir += "/CMakeScripts";
cmSystemTools::MakeDirectory(dir.c_str());
std::string makefile = dir;
makefile += "/"; makefile += "/";
makefile += target.GetName(); makefile += target.GetName();
makefile += "_"; makefile += "_";
@ -706,11 +709,10 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
<< cc.GetArguments() << "\n"; << cc.GetArguments() << "\n";
} }
} }
std::string cdir = m_CurrentMakefile->GetCurrentOutputDirectory();
std::string dir = this->ConvertToRelativeOutputPath( cdir = this->ConvertToRelativeOutputPath(cdir.c_str());
m_CurrentMakefile->GetCurrentOutputDirectory());
std::string makecmd = "make -C "; std::string makecmd = "make -C ";
makecmd += dir; makecmd += cdir;
makecmd += " -f "; makecmd += " -f ";
makecmd += makefile; makecmd += makefile;
buildphase->AddAttribute("shellScript", this->CreateString(makecmd.c_str())); buildphase->AddAttribute("shellScript", this->CreateString(makecmd.c_str()));