summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-02-18 19:32:55 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-02-18 19:32:55 (GMT)
commitc60cf6585d820151c760e1ef9078bd4b2ba5eca1 (patch)
tree8d0326cb50c14f445e3e386dc33936c8b0a6d511 /Source/cmGlobalXCodeGenerator.cxx
parent4aab13b710626de23745275e6f351a753b56e39e (diff)
downloadCMake-c60cf6585d820151c760e1ef9078bd4b2ba5eca1.zip
CMake-c60cf6585d820151c760e1ef9078bd4b2ba5eca1.tar.gz
CMake-c60cf6585d820151c760e1ef9078bd4b2ba5eca1.tar.bz2
COMP: remove warning
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx18
1 files changed, 10 insertions, 8 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index fe149c7..965c3f8 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -233,6 +233,8 @@ cmGlobalXCodeGenerator::AddExtraTargets(cmLocalGenerator* root,
std::string dir = this->ConvertToRelativeOutputPath(
mf->GetCurrentOutputDirectory());
m_CurrentXCodeHackMakefile = dir;
+ m_CurrentXCodeHackMakefile += "/CMakeScripts";
+ cmSystemTools::MakeDirectory(m_CurrentXCodeHackMakefile.c_str());
m_CurrentXCodeHackMakefile += "/XCODE_DEPEND_HELPER.make";
std::string makecommand = "make -C ";
makecommand += dir;
@@ -326,8 +328,7 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg,
{
std::string flags;
// Add flags from source file properties.
- m_CurrentLocalGenerator
- ->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
+ lg->AppendFlags(flags, sf->GetProperty("COMPILE_FLAGS"));
cmXCodeObject* fileRef = this->CreateObject(cmXCodeObject::PBXFileReference);
m_SourcesGroupChildren->AddObject(fileRef);
@@ -628,8 +629,10 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
const & commands,
const char* name)
{
- std::string makefile = m_CurrentMakefile->GetCurrentOutputDirectory();
- cmSystemTools::MakeDirectory(makefile.c_str());
+ std::string dir = m_CurrentMakefile->GetCurrentOutputDirectory();
+ dir += "/CMakeScripts";
+ cmSystemTools::MakeDirectory(dir.c_str());
+ std::string makefile = dir;
makefile += "/";
makefile += target.GetName();
makefile += "_";
@@ -706,11 +709,10 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
<< cc.GetArguments() << "\n";
}
}
-
- std::string dir = this->ConvertToRelativeOutputPath(
- m_CurrentMakefile->GetCurrentOutputDirectory());
+ std::string cdir = m_CurrentMakefile->GetCurrentOutputDirectory();
+ cdir = this->ConvertToRelativeOutputPath(cdir.c_str());
std::string makecmd = "make -C ";
- makecmd += dir;
+ makecmd += cdir;
makecmd += " -f ";
makecmd += makefile;
buildphase->AddAttribute("shellScript", this->CreateString(makecmd.c_str()));