summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.h
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-29 14:02:09 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-05-29 14:05:09 (GMT)
commitf248f8ad7898816a5a627e288d3a04fed993967f (patch)
tree39474bb70be2d89d344e55ba4aa5def19905ee28 /Source/cmGlobalXCodeGenerator.h
parent42752d0c11df67a9ca4f5e71efa58965c58552f8 (diff)
parent1ab3881ec9e809ac5f6cad5cd84048310b8683e2 (diff)
downloadCMake-f248f8ad7898816a5a627e288d3a04fed993967f.zip
CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.gz
CMake-f248f8ad7898816a5a627e288d3a04fed993967f.tar.bz2
Merge topic 'parallel_build_option'
1ab3881ec9 cmake: Add options for parallel builds to --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !1962
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.h')
-rw-r--r--Source/cmGlobalXCodeGenerator.h12
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index 7c51177..f7f4428 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -66,13 +66,11 @@ public:
* Try running cmake and building a file. This is used for dynalically
* loaded commands, not as part of the usual build process.
*/
- void GenerateBuildCommand(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,
- std::vector<std::string> const& makeOptions =
+ void GenerateBuildCommand(
+ 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,
+ int jobs, bool verbose, std::vector<std::string> const& makeOptions =
std::vector<std::string>()) override;
/** Append the subdirectory for the given configuration. */