summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2005-02-16 23:47:30 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2005-02-16 23:47:30 (GMT)
commit6bf064d41c0baba1b0afc33f3d86222938d2a374 (patch)
tree07fd34dd6d36aa44220aee616b58b0d26a78104b
parentcb73410ccb8d2c05085b8fc5551215214bf12edd (diff)
downloadCMake-6bf064d41c0baba1b0afc33f3d86222938d2a374.zip
CMake-6bf064d41c0baba1b0afc33f3d86222938d2a374.tar.gz
CMake-6bf064d41c0baba1b0afc33f3d86222938d2a374.tar.bz2
ENH: use ALL_BUILD target
-rw-r--r--Source/cmCTest.cxx5
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx7
2 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmCTest.cxx b/Source/cmCTest.cxx
index 1e25ba1..8e1e88d 100644
--- a/Source/cmCTest.cxx
+++ b/Source/cmCTest.cxx
@@ -1884,15 +1884,14 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
makeCommand += " -project ";
makeCommand += m_BuildProject;
makeCommand += ".xcode";
- makeCommand += " build ";
+ makeCommand += " build -target ";
if (m_BuildTarget.size())
{
- makeCommand += "-target ";
makeCommand += m_BuildTarget;
}
else
{
- makeCommand += "-alltargets ";
+ makeCommand += "ALL_BUILD ";
}
makeCommand += " -buildstyle Development ";
}
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 714f441..f5ca532 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -110,12 +110,15 @@ int cmGlobalXCodeGenerator::TryCompile(const char *,
makeCommand += " -project ";
makeCommand += projectName;
makeCommand += ".xcode";
- makeCommand += " build ";
+ makeCommand += " build -target ";
if (targetName)
{
- makeCommand += "-target ";
makeCommand += targetName;
}
+ else
+ {
+ makeCommand += "ALL_BUILD";
+ }
makeCommand += " -buildstyle Development ";
makeCommand += " SYMROOT=";
makeCommand += cmSystemTools::ConvertToOutputPath(bindir);