diff options
author | Kitware Robot <kwrobot@kitware.com> | 2016-05-16 14:34:04 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2016-05-16 20:05:19 (GMT) |
commit | d9fd2f5402eeaa345691313658e02b51038f570b (patch) | |
tree | dca71b9a7e267f4c6300da3eb770415381726785 /Source/cmakemain.cxx | |
parent | 82df6deaafb36cbbfd450202bb20b320f637751a (diff) | |
download | CMake-d9fd2f5402eeaa345691313658e02b51038f570b.zip CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.gz CMake-d9fd2f5402eeaa345691313658e02b51038f570b.tar.bz2 |
Revise C++ coding style using clang-format
Run the `Utilities/Scripts/clang-format.bash` script to update
all our C++ code to a new style defined by `.clang-format`.
Use `clang-format` version 3.8.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmakemain.cxx')
-rw-r--r-- | Source/cmakemain.cxx | 348 |
1 files changed, 139 insertions, 209 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 5f086d5..056671a 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -28,65 +28,57 @@ #include <cmsys/Encoding.hxx> #ifdef CMAKE_BUILD_WITH_CMAKE -static const char * cmDocumentationName[][2] = -{ - {0, - " cmake - Cross-Platform Makefile Generator."}, - {0,0} +static const char* cmDocumentationName[][2] = { + { 0, " cmake - Cross-Platform Makefile Generator." }, + { 0, 0 } }; -static const char * cmDocumentationUsage[][2] = -{ - {0, - " cmake [options] <path-to-source>\n" - " cmake [options] <path-to-existing-build>"}, - {0, - "Specify a source directory to (re-)generate a build system for " - "it in the current working directory. Specify an existing build " - "directory to re-generate its build system."}, - {0,0} +static const char* cmDocumentationUsage[][2] = { + { 0, " cmake [options] <path-to-source>\n" + " cmake [options] <path-to-existing-build>" }, + { 0, "Specify a source directory to (re-)generate a build system for " + "it in the current working directory. Specify an existing build " + "directory to re-generate its build system." }, + { 0, 0 } }; -static const char * cmDocumentationUsageNote[][2] = -{ - {0, - "Run 'cmake --help' for more information."}, - {0,0} +static const char* cmDocumentationUsageNote[][2] = { + { 0, "Run 'cmake --help' for more information." }, + { 0, 0 } }; -#define CMAKE_BUILD_OPTIONS \ - " <dir> = Project binary directory to be built.\n" \ - " --target <tgt> = Build <tgt> instead of default targets.\n" \ - " May only be specified once.\n" \ - " --config <cfg> = For multi-configuration tools, choose <cfg>.\n" \ - " --clean-first = Build target 'clean' first, then build.\n" \ - " (To clean only, use --target 'clean'.)\n" \ - " --use-stderr = Ignored. Behavior is default in CMake >= 3.0.\n" \ +#define CMAKE_BUILD_OPTIONS \ + " <dir> = Project binary directory to be built.\n" \ + " --target <tgt> = Build <tgt> instead of default targets.\n" \ + " May only be specified once.\n" \ + " --config <cfg> = For multi-configuration tools, choose <cfg>.\n" \ + " --clean-first = Build target 'clean' first, then build.\n" \ + " (To clean only, use --target 'clean'.)\n" \ + " --use-stderr = Ignored. Behavior is default in CMake >= 3.0.\n" \ " -- = Pass remaining options to the native tool.\n" -static const char * cmDocumentationOptions[][2] = -{ +static const char* cmDocumentationOptions[][2] = { CMAKE_STANDARD_OPTIONS_TABLE, - {"-E", "CMake command mode."}, - {"-L[A][H]", "List non-advanced cached variables."}, - {"--build <dir>", "Build a CMake-generated project binary tree."}, - {"-N", "View mode only."}, - {"-P <file>", "Process script mode."}, - {"--find-package", "Run in pkg-config like mode."}, - {"--graphviz=[file]", "Generate graphviz of dependencies, see " - "CMakeGraphVizOptions.cmake for more."}, - {"--system-information [file]", "Dump information about this system."}, - {"--debug-trycompile", "Do not delete the try_compile build tree. Only " - "useful on one try_compile at a time."}, - {"--debug-output", "Put cmake in a debug mode."}, - {"--trace", "Put cmake in trace mode."}, - {"--trace-expand", "Put cmake in trace mode with variable expansion."}, - {"--warn-uninitialized", "Warn about uninitialized values."}, - {"--warn-unused-vars", "Warn about unused variables."}, - {"--no-warn-unused-cli", "Don't warn about command line options."}, - {"--check-system-vars", "Find problems with variable usage in system " - "files."}, - {0,0} + { "-E", "CMake command mode." }, + { "-L[A][H]", "List non-advanced cached variables." }, + { "--build <dir>", "Build a CMake-generated project binary tree." }, + { "-N", "View mode only." }, + { "-P <file>", "Process script mode." }, + { "--find-package", "Run in pkg-config like mode." }, + { "--graphviz=[file]", "Generate graphviz of dependencies, see " + "CMakeGraphVizOptions.cmake for more." }, + { "--system-information [file]", "Dump information about this system." }, + { "--debug-trycompile", "Do not delete the try_compile build tree. Only " + "useful on one try_compile at a time." }, + { "--debug-output", "Put cmake in a debug mode." }, + { "--trace", "Put cmake in trace mode." }, + { "--trace-expand", "Put cmake in trace mode with variable expansion." }, + { "--warn-uninitialized", "Warn about uninitialized values." }, + { "--warn-unused-vars", "Warn about unused variables." }, + { "--no-warn-unused-cli", "Don't warn about command line options." }, + { "--check-system-vars", "Find problems with variable usage in system " + "files." }, + { 0, 0 } }; #endif @@ -103,67 +95,59 @@ static int do_command(int ac, char const* const* av) int do_cmake(int ac, char const* const* av); static int do_build(int ac, char const* const* av); -static cmMakefile* cmakemainGetMakefile(void *clientdata) +static cmMakefile* cmakemainGetMakefile(void* clientdata) { - cmake* cm = (cmake *)clientdata; - if(cm && cm->GetDebugOutput()) - { - cmGlobalGenerator* gg=cm->GetGlobalGenerator(); - if (gg) - { + cmake* cm = (cmake*)clientdata; + if (cm && cm->GetDebugOutput()) { + cmGlobalGenerator* gg = cm->GetGlobalGenerator(); + if (gg) { return gg->GetCurrentMakefile(); - } } + } return 0; } -static std::string cmakemainGetStack(void *clientdata) +static std::string cmakemainGetStack(void* clientdata) { std::string msg; - cmMakefile* mf=cmakemainGetMakefile(clientdata); - if (mf) - { + cmMakefile* mf = cmakemainGetMakefile(clientdata); + if (mf) { msg = mf->FormatListFileStack(); - if (!msg.empty()) - { + if (!msg.empty()) { msg = "\n Called from: " + msg; - } } + } return msg; } static void cmakemainMessageCallback(const char* m, const char*, bool&, - void *clientdata) + void* clientdata) { std::cerr << m << cmakemainGetStack(clientdata) << std::endl << std::flush; } -static void cmakemainProgressCallback(const char *m, float prog, +static void cmakemainProgressCallback(const char* m, float prog, void* clientdata) { cmMakefile* mf = cmakemainGetMakefile(clientdata); std::string dir; - if ((mf) && (strstr(m, "Configuring")==m) && (prog<0)) - { + if ((mf) && (strstr(m, "Configuring") == m) && (prog < 0)) { dir = " "; dir += mf->GetCurrentSourceDirectory(); - } - else if ((mf) && (strstr(m, "Generating")==m)) - { + } else if ((mf) && (strstr(m, "Generating") == m)) { dir = " "; dir += mf->GetCurrentBinaryDirectory(); - } + } - if ((prog < 0) || (!dir.empty())) - { - std::cout << "-- " << m << dir << cmakemainGetStack(clientdata)<<std::endl; - } + if ((prog < 0) || (!dir.empty())) { + std::cout << "-- " << m << dir << cmakemainGetStack(clientdata) + << std::endl; + } std::cout.flush(); } - int main(int ac, char const* const* av) { cmsys::Encoding::CommandLineArguments args = @@ -173,17 +157,13 @@ int main(int ac, char const* const* av) cmSystemTools::EnableMSVCDebugHook(); cmSystemTools::FindCMakeResources(av[0]); - if(ac > 1) - { - if(strcmp(av[1], "--build") == 0) - { + if (ac > 1) { + if (strcmp(av[1], "--build") == 0) { return do_build(ac, av); - } - else if(strcmp(av[1], "-E") == 0) - { + } else if (strcmp(av[1], "-E") == 0) { return do_command(ac, av); - } } + } int ret = do_cmake(ac, av); #ifdef CMAKE_BUILD_WITH_CMAKE cmDynamicLoader::FlushCache(); @@ -193,18 +173,16 @@ int main(int ac, char const* const* av) int do_cmake(int ac, char const* const* av) { - if (cmSystemTools::GetCurrentWorkingDirectory().empty()) - { + if (cmSystemTools::GetCurrentWorkingDirectory().empty()) { std::cerr << "Current working directory cannot be established." << std::endl; return 1; - } + } #ifdef CMAKE_BUILD_WITH_CMAKE cmDocumentation doc; doc.addCMakeStandardDocSections(); - if(doc.CheckOptions(ac, av)) - { + if (doc.CheckOptions(ac, av)) { // Construct and print requested documentation. cmake hcm; hcm.SetHomeDirectory(""); @@ -221,25 +199,23 @@ int do_cmake(int ac, char const* const* av) hcm.GetGeneratorDocumentation(generators); doc.SetName("cmake"); - doc.SetSection("Name",cmDocumentationName); - doc.SetSection("Usage",cmDocumentationUsage); - if ( ac == 1 ) - { - doc.AppendSection("Usage",cmDocumentationUsageNote); - } - doc.AppendSection("Generators",generators); - doc.PrependSection("Options",cmDocumentationOptions); - - return doc.PrintRequestedDocumentation(std::cout)? 0:1; + doc.SetSection("Name", cmDocumentationName); + doc.SetSection("Usage", cmDocumentationUsage); + if (ac == 1) { + doc.AppendSection("Usage", cmDocumentationUsageNote); } + doc.AppendSection("Generators", generators); + doc.PrependSection("Options", cmDocumentationOptions); + + return doc.PrintRequestedDocumentation(std::cout) ? 0 : 1; + } #else - if ( ac == 1 ) - { - std::cout << - "Bootstrap CMake should not be used outside CMake build process." - << std::endl; + if (ac == 1) { + std::cout + << "Bootstrap CMake should not be used outside CMake build process." + << std::endl; return 0; - } + } #endif bool sysinfo = false; @@ -249,10 +225,8 @@ int do_cmake(int ac, char const* const* av) bool view_only = false; cmake::WorkingMode workingMode = cmake::NORMAL_MODE; std::vector<std::string> args; - for(int i =0; i < ac; ++i) - { - if(strcmp(av[i], "-i") == 0) - { + for (int i = 0; i < ac; ++i) { + if (strcmp(av[i], "-i") == 0) { /* clang-format off */ std::cerr << "The \"cmake -i\" wizard mode is no longer supported.\n" @@ -260,117 +234,85 @@ int do_cmake(int ac, char const* const* av) "Use cmake-gui or ccmake for an interactive dialog.\n"; /* clang-format on */ return 1; - } - else if(strcmp(av[i], "--system-information") == 0) - { + } else if (strcmp(av[i], "--system-information") == 0) { sysinfo = true; - } - else if (strcmp(av[i], "-N") == 0) - { + } else if (strcmp(av[i], "-N") == 0) { view_only = true; - } - else if (strcmp(av[i], "-L") == 0) - { + } else if (strcmp(av[i], "-L") == 0) { list_cached = true; - } - else if (strcmp(av[i], "-LA") == 0) - { + } else if (strcmp(av[i], "-LA") == 0) { list_all_cached = true; - } - else if (strcmp(av[i], "-LH") == 0) - { + } else if (strcmp(av[i], "-LH") == 0) { list_cached = true; list_help = true; - } - else if (strcmp(av[i], "-LAH") == 0) - { + } else if (strcmp(av[i], "-LAH") == 0) { list_all_cached = true; list_help = true; - } - else if (cmHasLiteralPrefix(av[i], "-P")) - { - if ( i == ac -1 ) - { + } else if (cmHasLiteralPrefix(av[i], "-P")) { + if (i == ac - 1) { cmSystemTools::Error("No script specified for argument -P"); - } - else - { + } else { workingMode = cmake::SCRIPT_MODE; args.push_back(av[i]); i++; args.push_back(av[i]); - } } - else if (cmHasLiteralPrefix(av[i], "--find-package")) - { + } else if (cmHasLiteralPrefix(av[i], "--find-package")) { workingMode = cmake::FIND_PACKAGE_MODE; args.push_back(av[i]); - } - else - { + } else { args.push_back(av[i]); - } } - if (sysinfo) - { + } + if (sysinfo) { cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); int ret = cm.GetSystemInformation(args); return ret; - } + } cmake cm; cm.SetHomeDirectory(""); cm.SetHomeOutputDirectory(""); - cmSystemTools::SetMessageCallback(cmakemainMessageCallback, (void *)&cm); - cm.SetProgressCallback(cmakemainProgressCallback, (void *)&cm); + cmSystemTools::SetMessageCallback(cmakemainMessageCallback, (void*)&cm); + cm.SetProgressCallback(cmakemainProgressCallback, (void*)&cm); cm.SetWorkingMode(workingMode); int res = cm.Run(args, view_only); - if ( list_cached || list_all_cached ) - { + if (list_cached || list_all_cached) { std::cout << "-- Cache values" << std::endl; std::vector<std::string> keys = cm.GetState()->GetCacheEntryKeys(); for (std::vector<std::string>::const_iterator it = keys.begin(); - it != keys.end(); ++it) - { + it != keys.end(); ++it) { cmState::CacheEntryType t = cm.GetState()->GetCacheEntryType(*it); if (t != cmState::INTERNAL && t != cmState::STATIC && - t != cmState::UNINITIALIZED) - { + t != cmState::UNINITIALIZED) { const char* advancedProp = - cm.GetState()->GetCacheEntryProperty(*it, "ADVANCED"); - if ( list_all_cached || !advancedProp) - { - if ( list_help ) - { + cm.GetState()->GetCacheEntryProperty(*it, "ADVANCED"); + if (list_all_cached || !advancedProp) { + if (list_help) { std::cout << "// " << cm.GetState()->GetCacheEntryProperty(*it, - "HELPSTRING") << std::endl; - } - std::cout << *it << ":" << - cmState::CacheEntryTypeToString(t) - << "=" << cm.GetState()->GetCacheEntryValue(*it) - << std::endl; - if ( list_help ) - { + "HELPSTRING") + << std::endl; + } + std::cout << *it << ":" << cmState::CacheEntryTypeToString(t) << "=" + << cm.GetState()->GetCacheEntryValue(*it) << std::endl; + if (list_help) { std::cout << std::endl; - } } } } } + } // Always return a non-negative value. Windows tools do not always // interpret negative return values as errors. - if(res != 0) - { + if (res != 0) { return 1; - } - else - { + } else { return 0; - } + } } static int do_build(int ac, char const* const* av) @@ -386,49 +328,38 @@ static int do_build(int ac, char const* const* av) bool clean = false; bool hasTarget = false; - enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative}; + enum Doing + { + DoingNone, + DoingDir, + DoingTarget, + DoingConfig, + DoingNative + }; Doing doing = DoingDir; - for(int i=2; i < ac; ++i) - { - if(doing == DoingNative) - { + for (int i = 2; i < ac; ++i) { + if (doing == DoingNative) { nativeOptions.push_back(av[i]); - } - else if(strcmp(av[i], "--target") == 0) - { - if (!hasTarget) - { + } else if (strcmp(av[i], "--target") == 0) { + if (!hasTarget) { doing = DoingTarget; hasTarget = true; - } - else - { + } else { std::cerr << "'--target' may not be specified more than once.\n\n"; dir = ""; break; - } } - else if(strcmp(av[i], "--config") == 0) - { + } else if (strcmp(av[i], "--config") == 0) { doing = DoingConfig; - } - else if(strcmp(av[i], "--clean-first") == 0) - { + } else if (strcmp(av[i], "--clean-first") == 0) { clean = true; doing = DoingNone; - } - else if(strcmp(av[i], "--use-stderr") == 0) - { + } else if (strcmp(av[i], "--use-stderr") == 0) { /* tolerate legacy option */ - } - else if(strcmp(av[i], "--") == 0) - { + } else if (strcmp(av[i], "--") == 0) { doing = DoingNative; - } - else - { - switch (doing) - { + } else { + switch (doing) { case DoingDir: dir = cmSystemTools::CollapseFullPath(av[i]); doing = DoingNone; @@ -445,11 +376,10 @@ static int do_build(int ac, char const* const* av) std::cerr << "Unknown argument " << av[i] << std::endl; dir = ""; break; - } } } - if(dir.empty()) - { + } + if (dir.empty()) { /* clang-format off */ std::cerr << "Usage: cmake --build <dir> [options] [-- [native-options]]\n" @@ -458,7 +388,7 @@ static int do_build(int ac, char const* const* av) ; /* clang-format on */ return 1; - } + } cmake cm; return cm.Build(dir, target, config, nativeOptions, clean); |