diff options
| author | Brad King <brad.king@kitware.com> | 2019-03-14 15:06:07 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-03-14 15:06:19 (GMT) |
| commit | accbf41da54ee9cbbedd040676e02ee57d47b73b (patch) | |
| tree | 654586af4921c890ebe61a28a6695d52b135ee5c /Source | |
| parent | 46ad0f7e9dfa57ed4c1bd9f85f08ec5ec9d32f17 (diff) | |
| parent | 077ab5774c637eb2262587425199579c90967577 (diff) | |
| download | CMake-accbf41da54ee9cbbedd040676e02ee57d47b73b.zip CMake-accbf41da54ee9cbbedd040676e02ee57d47b73b.tar.gz CMake-accbf41da54ee9cbbedd040676e02ee57d47b73b.tar.bz2 | |
Merge topic 'short-commands'
077ab5774c cmake: add short version of '--target <tgt>...' option
071f5e1544 cmake: Reformat '--parallel' and '--verbose' options in help
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3078
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmakemain.cxx | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index 1c56bcd..b83c744 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -54,20 +54,21 @@ static const char* cmDocumentationUsageNote[][2] = { # define CMAKE_BUILD_OPTIONS \ " <dir> = Project binary directory to be built.\n" \ - " -j [<jobs>] --parallel [<jobs>] = Build in parallel using\n" \ - " the given number of jobs. If <jobs> is omitted\n" \ - " the native build tool's default number is used.\n" \ + " --parallel [<jobs>], -j [<jobs>]\n" \ + " = Build in parallel using the given number of jobs. \n" \ + " If <jobs> is omitted the native build tool's \n" \ + " default number is used.\n" \ " The CMAKE_BUILD_PARALLEL_LEVEL environment " \ "variable\n" \ " specifies a default parallel level when this " \ "option\n" \ " is not given.\n" \ - " --target <tgt> = Build <tgt> instead of default targets.\n" \ - " May be specified multiple times.\n" \ + " --target <tgt>..., -t <tgt>... \n" \ + " = Build <tgt> instead of default targets.\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" \ - " -v --verbose = Enable verbose output - if supported - including\n" \ + " --verbose, -v = Enable verbose output - if supported - including\n" \ " the build commands to be executed. \n" \ " -- = Pass remaining options to the native tool.\n" @@ -429,7 +430,8 @@ static int do_build(int ac, char const* const* av) dir.clear(); } doing = DoingNone; - } else if (strcmp(av[i], "--target") == 0) { + } else if ((strcmp(av[i], "--target") == 0) || + (strcmp(av[i], "-t") == 0)) { doing = DoingTarget; } else if (strcmp(av[i], "--config") == 0) { doing = DoingConfig; |