diff options
| author | Petr Kmoch <petr.kmoch@gmail.com> | 2013-03-21 14:53:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-04-12 15:35:35 (GMT) |
| commit | de8be9ef7d019023099d28a1f797698ed7b598bd (patch) | |
| tree | 1d52ce4dfbec1746b56b82fb131b5c9d03cdd586 /Source/cmGlobalGenerator.cxx | |
| parent | 674f918a1afbf1808328bac944aa8944f2475fe9 (diff) | |
| download | CMake-de8be9ef7d019023099d28a1f797698ed7b598bd.zip CMake-de8be9ef7d019023099d28a1f797698ed7b598bd.tar.gz CMake-de8be9ef7d019023099d28a1f797698ed7b598bd.tar.bz2 | |
Add projectDir parameter to GenerateBuildCommand
Extend the cmGlobalGenerator::GenerateBuildCommand virtual method
signature with a "projectDir" parameter specifying the top of the
project build tree for which the build command will be generated.
Populate it from call sites in cmGlobalGenerator::Build where a
fully-generated build tree should be available.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx index df14331..e6fc630 100644 --- a/Source/cmGlobalGenerator.cxx +++ b/Source/cmGlobalGenerator.cxx @@ -1340,11 +1340,13 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir, std::string cmGlobalGenerator ::GenerateBuildCommand(const char* makeProgram, const char *projectName, - const char* additionalOptions, const char *targetName, - const char* config, bool ignoreErrors, bool) + const char *projectDir, const char* additionalOptions, + const char *targetName, const char* config, + bool ignoreErrors, bool) { - // Project name and config are not used yet. + // Project name & dir and config are not used yet. (void)projectName; + (void)projectDir; (void)config; std::string makeCommand = @@ -1411,7 +1413,7 @@ int cmGlobalGenerator::Build( if (clean) { std::string cleanCommand = - this->GenerateBuildCommand(makeCommandCSTR, projectName, + this->GenerateBuildCommand(makeCommandCSTR, projectName, bindir, 0, "clean", config, false, fast); if(output) { @@ -1443,7 +1445,7 @@ int cmGlobalGenerator::Build( // now build std::string makeCommand = - this->GenerateBuildCommand(makeCommandCSTR, projectName, + this->GenerateBuildCommand(makeCommandCSTR, projectName, bindir, extraOptions, target, config, false, fast); if(output) |