summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2008-10-15 17:56:07 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2008-10-15 17:56:07 (GMT)
commit1777bb502a3c8dbcead54b11fe403e13fe9c225c (patch)
treee85da2c575bc1e88254287b220e4e236065f3285 /Source/cmGlobalGenerator.cxx
parente099dccf4b3772c10c076ec1044dae01da510d28 (diff)
downloadCMake-1777bb502a3c8dbcead54b11fe403e13fe9c225c.zip
CMake-1777bb502a3c8dbcead54b11fe403e13fe9c225c.tar.gz
CMake-1777bb502a3c8dbcead54b11fe403e13fe9c225c.tar.bz2
BUG: 4244, add a --build option to cmake that can build projects configured by CMake
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx11
1 files changed, 7 insertions, 4 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 39891e7..0e520d7 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1117,7 +1117,9 @@ int cmGlobalGenerator::Build(
const char *makeCommandCSTR,
const char *config,
bool clean, bool fast,
- double timeout)
+ double timeout,
+ bool verbose,
+ const char* extraOptions)
{
/**
* Run an executable command and put the stdout in output.
@@ -1155,7 +1157,7 @@ int cmGlobalGenerator::Build(
}
if (!cmSystemTools::RunSingleCommand(cleanCommand.c_str(), outputPtr,
- &retVal, 0, false, timeout))
+ &retVal, 0, verbose, timeout))
{
cmSystemTools::SetRunCommandHideConsole(hideconsole);
cmSystemTools::Error("Generator: execution of make clean failed.");
@@ -1178,7 +1180,8 @@ int cmGlobalGenerator::Build(
// now build
std::string makeCommand =
this->GenerateBuildCommand(makeCommandCSTR, projectName,
- 0, target, config, false, fast);
+ extraOptions, target,
+ config, false, fast);
if(output)
{
*output += "\nRun Build Command:";
@@ -1187,7 +1190,7 @@ int cmGlobalGenerator::Build(
}
if (!cmSystemTools::RunSingleCommand(makeCommand.c_str(), outputPtr,
- &retVal, 0, false, timeout))
+ &retVal, 0, verbose, timeout))
{
cmSystemTools::SetRunCommandHideConsole(hideconsole);
cmSystemTools::Error