diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-06 13:32:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-06 13:32:39 (GMT) |
| commit | 809890e3f6bcb1a5def21e2e99a54bb6f38505fc (patch) | |
| tree | 4b7e3f73bc6cea6567779b4eefa1b0a6f67f4334 /Source/cmGlobalGhsMultiGenerator.h | |
| parent | 43771d6e7384d7539144638d77ea96cad16a8203 (diff) | |
| parent | 324d18bb3418aee8dcb63e28106ac0dac6abea71 (diff) | |
| download | CMake-809890e3f6bcb1a5def21e2e99a54bb6f38505fc.zip CMake-809890e3f6bcb1a5def21e2e99a54bb6f38505fc.tar.gz CMake-809890e3f6bcb1a5def21e2e99a54bb6f38505fc.tar.bz2 | |
Merge topic 'issue-18883-support-for-multiple-targets'
324d18bb34 cmake: Teach --build mode to support multiple targets
ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand
fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct
b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help
f1367c8c51 cmGlobalGenerator: Remove unused code
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2939
Diffstat (limited to 'Source/cmGlobalGhsMultiGenerator.h')
| -rw-r--r-- | Source/cmGlobalGhsMultiGenerator.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/Source/cmGlobalGhsMultiGenerator.h b/Source/cmGlobalGhsMultiGenerator.h index bc2b199..c39f40f 100644 --- a/Source/cmGlobalGhsMultiGenerator.h +++ b/Source/cmGlobalGhsMultiGenerator.h @@ -88,15 +88,12 @@ public: protected: void Generate() override; - void GenerateBuildCommand(GeneratedMakeCommand& 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; + std::vector<GeneratedMakeCommand> GenerateBuildCommand( + const std::string& makeProgram, const std::string& projectName, + const std::string& projectDir, std::vector<std::string> const& targetNames, + const std::string& config, bool fast, int jobs, bool verbose, + std::vector<std::string> const& makeOptions = + std::vector<std::string>()) override; private: void GetToolset(cmMakefile* mf, std::string& tsd, const std::string& ts); |