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/cmakemain.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/cmakemain.cxx')
| -rw-r--r-- | Source/cmakemain.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 785fd90..d8207fa 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -257,10 +257,12 @@ int do_cmake(int ac, char const* const* av) { if(strcmp(av[i], "-i") == 0) { + /* clang-format off */ std::cerr << "The \"cmake -i\" wizard mode is no longer supported.\n" "Use the -D option to set cache values on the command line.\n" "Use cmake-gui or ccmake for an interactive dialog.\n"; + /* clang-format on */ return 1; } else if(strcmp(av[i], "--system-information") == 0) @@ -453,11 +455,13 @@ static int do_build(int ac, char const* const* av) } if(dir.empty()) { + /* clang-format off */ std::cerr << "Usage: cmake --build <dir> [options] [-- [native-options]]\n" "Options:\n" CMAKE_BUILD_OPTIONS ; + /* clang-format on */ return 1; } |