diff options
| author | Brad King <brad.king@kitware.com> | 2016-05-09 13:01:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-05-09 13:01:08 (GMT) |
| commit | 7ecd9648a166ecf500badfd0c4eab77a15101c35 (patch) | |
| tree | 29dba5c66e0b210f846e64b64f2af21e8fcddc1e /Source/cmake.cxx | |
| parent | 488b82f8ccca4de8a052b94ddf2be131682561cb (diff) | |
| parent | afca373510b5303d55fde17085718323ea9b2cb9 (diff) | |
| download | CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.zip CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.gz CMake-7ecd9648a166ecf500badfd0c4eab77a15101c35.tar.bz2 | |
Merge topic 'clang-format-prep'
afca3735 Help clang-format wrap after braces on long initializer lists
85425a3e Move comments off of class access specifier lines
64b55203 Isolate formatted streaming blocks with clang-format off/on
Diffstat (limited to 'Source/cmake.cxx')
| -rw-r--r-- | Source/cmake.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmake.cxx b/Source/cmake.cxx index f176cc1..3319af1 100644 --- a/Source/cmake.cxx +++ b/Source/cmake.cxx @@ -1229,10 +1229,12 @@ int cmake::HandleDeleteCacheVariables(const std::string& var) } std::vector<SaveCacheEntry> saved; std::ostringstream warning; + /* clang-format off */ warning << "You have changed variables that require your cache to be deleted.\n" << "Configure will be re-run and you may have to reset some variables.\n" << "The following variables have changed:\n"; + /* clang-format on */ for(std::vector<std::string>::iterator i = argsSplit.begin(); i != argsSplit.end(); ++i) { @@ -1429,6 +1431,7 @@ int cmake::ActualConfigure() const char* GeneratorName; }; VSRegistryEntryName version[] = { + /* clang-format needs this comment to break after the opening brace */ {"7.1", "Visual Studio 7 .NET 2003"}, {"8.0", "Visual Studio 8 2005"}, {"9.0", "Visual Studio 9 2008"}, |