ENH: use ALL_BUILD target
This commit is contained in:
parent
cb73410ccb
commit
6bf064d41c
|
@ -1884,15 +1884,14 @@ int cmCTest::RunCMakeAndTest(std::string* outstring)
|
||||||
makeCommand += " -project ";
|
makeCommand += " -project ";
|
||||||
makeCommand += m_BuildProject;
|
makeCommand += m_BuildProject;
|
||||||
makeCommand += ".xcode";
|
makeCommand += ".xcode";
|
||||||
makeCommand += " build ";
|
makeCommand += " build -target ";
|
||||||
if (m_BuildTarget.size())
|
if (m_BuildTarget.size())
|
||||||
{
|
{
|
||||||
makeCommand += "-target ";
|
|
||||||
makeCommand += m_BuildTarget;
|
makeCommand += m_BuildTarget;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
makeCommand += "-alltargets ";
|
makeCommand += "ALL_BUILD ";
|
||||||
}
|
}
|
||||||
makeCommand += " -buildstyle Development ";
|
makeCommand += " -buildstyle Development ";
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,12 +110,15 @@ int cmGlobalXCodeGenerator::TryCompile(const char *,
|
||||||
makeCommand += " -project ";
|
makeCommand += " -project ";
|
||||||
makeCommand += projectName;
|
makeCommand += projectName;
|
||||||
makeCommand += ".xcode";
|
makeCommand += ".xcode";
|
||||||
makeCommand += " build ";
|
makeCommand += " build -target ";
|
||||||
if (targetName)
|
if (targetName)
|
||||||
{
|
{
|
||||||
makeCommand += "-target ";
|
|
||||||
makeCommand += targetName;
|
makeCommand += targetName;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
makeCommand += "ALL_BUILD";
|
||||||
|
}
|
||||||
makeCommand += " -buildstyle Development ";
|
makeCommand += " -buildstyle Development ";
|
||||||
makeCommand += " SYMROOT=";
|
makeCommand += " SYMROOT=";
|
||||||
makeCommand += cmSystemTools::ConvertToOutputPath(bindir);
|
makeCommand += cmSystemTools::ConvertToOutputPath(bindir);
|
||||||
|
|
Loading…
Reference in New Issue