diff options
author | Florian Maushart <FloriansGit@online.ms> | 2018-04-14 20:50:19 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-05-25 13:42:20 (GMT) |
commit | 1ab3881ec9e809ac5f6cad5cd84048310b8683e2 (patch) | |
tree | 2b5c7c5a9ad2e38a584de50b5f019056883c3877 /Source/cmGlobalGenerator.h | |
parent | dfc692342831186053bd385605c8a21239e2e77d (diff) | |
download | CMake-1ab3881ec9e809ac5f6cad5cd84048310b8683e2.zip CMake-1ab3881ec9e809ac5f6cad5cd84048310b8683e2.tar.gz CMake-1ab3881ec9e809ac5f6cad5cd84048310b8683e2.tar.bz2 |
cmake: Add options for parallel builds to --build mode
While we already support `cmake --build . -- -j`, the options after `--`
are specific to the native build tool. Add new options `--parallel
[<N>]` and `-j [<N>]` to abstract this and map to the proper option
for the native build tool.
Diffstat (limited to 'Source/cmGlobalGenerator.h')
-rw-r--r-- | Source/cmGlobalGenerator.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmGlobalGenerator.h b/Source/cmGlobalGenerator.h index 34ed5b0..62c5441 100644 --- a/Source/cmGlobalGenerator.h +++ b/Source/cmGlobalGenerator.h @@ -147,9 +147,10 @@ public: * Try running cmake and building a file. This is used for dynamically * loaded commands, not as part of the usual build process. */ - int TryCompile(const std::string& srcdir, const std::string& bindir, - const std::string& projectName, const std::string& targetName, - bool fast, std::string& output, cmMakefile* mf); + int TryCompile(int jobs, const std::string& srcdir, + const std::string& bindir, const std::string& projectName, + const std::string& targetName, bool fast, std::string& output, + cmMakefile* mf); /** * Build a file given the following information. This is a more direct call @@ -157,7 +158,7 @@ public: * empty then all is assumed. clean indicates if a "make clean" should be * done first. */ - int Build(const std::string& srcdir, const std::string& bindir, + int Build(int jobs, const std::string& srcdir, const std::string& bindir, const std::string& projectName, const std::string& targetName, std::string& output, const std::string& makeProgram, const std::string& config, bool clean, bool fast, bool verbose, @@ -176,9 +177,11 @@ public: std::vector<std::string>& makeCommand, const std::string& makeProgram, const std::string& projectName, const std::string& projectDir, const std::string& targetName, const std::string& config, bool fast, - bool verbose, + int jobs, bool verbose, std::vector<std::string> const& makeOptions = std::vector<std::string>()); + virtual void PrintBuildCommandAdvice(std::ostream& os, int jobs) const; + /** Generate a "cmake --build" call for a given target and config. */ std::string GenerateCMakeBuildCommand(const std::string& target, const std::string& config, |