diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-01 16:52:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 16:52:38 (GMT) |
| commit | eed0df951d95d48e7856107175a2baba212c3206 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/cmGlobalVisualStudio7Generator.h | |
| parent | b671e4799f0e418448681a21120e8e87a97de5dc (diff) | |
| parent | d7204e649ed4ebb19bb341b4e49eb51514364922 (diff) | |
| download | CMake-eed0df951d95d48e7856107175a2baba212c3206.zip CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.gz CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.bz2 | |
Merge topic 'clang-format-6.0'
d7204e649e Revise C++ coding style using clang-format-6.0
12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition
523c443d13 clang-format.bash: update to clang-format-6.0
eb7ec19c1c clang-format: Add comments to suppress some formatting
b67a5bf175 Tests/VSWinStorePhone: Do not format managed source
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !2123
Diffstat (limited to 'Source/cmGlobalVisualStudio7Generator.h')
| -rw-r--r-- | Source/cmGlobalVisualStudio7Generator.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/Source/cmGlobalVisualStudio7Generator.h b/Source/cmGlobalVisualStudio7Generator.h index 77d4a96..0c9dd88 100644 --- a/Source/cmGlobalVisualStudio7Generator.h +++ b/Source/cmGlobalVisualStudio7Generator.h @@ -55,11 +55,14 @@ public: * Try running cmake and building a file. This is used for dynamically * 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, - int jobs, 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; /** |