kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'error-multiple-targets' 

497cad7c cmake: Teach --build to reject multiple --target options
886acd80 Help: Fix reference to `cmake --build` in cmake(1) manual
This commit is contained in:
Brad King 2016-02-08 10:32:55 -05:00 committed by CMake Topic Stage
parent 037738ac19 497cad7c88
commit 08e5362004
7 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Help/manual/cmake.1.rst
View File

@ -58,13 +58,14 @@ Options
<dir> = Project binary directory to be built.
--target <tgt> = Build <tgt> instead of default targets.
May only be specified once.
--config <cfg> = For multi-configuration tools, choose <cfg>.
--clean-first = Build target 'clean' first, then build.
(To clean only, use --target 'clean'.)
--use-stderr = Ignored. Behavior is default in CMake >= 3.0.
-- = Pass remaining options to the native tool.
Run cmake --build with no options for quick help.
Run ``cmake --build`` with no options for quick help.
``-N``
View mode only.

6
Help/release/dev/error-multiple-targets.rst Normal file
View File

@ -0,0 +1,6 @@
error-multiple-targets
----------------------
* The :manual:`cmake(1)` ``--build`` command-line tool now rejects multiple
``--target`` options with an error instead of silently ignoring all but the
last one.

12
Source/cmakemain.cxx
View File

@ -60,6 +60,7 @@ static const char * cmDocumentationUsageNote[][2] =
#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" \
@ -386,6 +387,7 @@ static int do_build(int ac, char const* const* av)
std::string dir;
std::vector<std::string> nativeOptions;
bool clean = false;
bool hasTarget = false;
enum Doing { DoingNone, DoingDir, DoingTarget, DoingConfig, DoingNative};
Doing doing = DoingDir;
@ -396,8 +398,18 @@ static int do_build(int ac, char const* const* av)
nativeOptions.push_back(av[i]);
}
else if(strcmp(av[i], "--target") == 0)
{
if (!hasTarget)
{
doing = DoingTarget;
hasTarget = true;
}
else
{
std::cerr << "'--target' may not be specified more than once.\n\n";
dir = "";
break;
}
}
else if(strcmp(av[i], "--config") == 0)
{

1
Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-result.txt Normal file
View File

@ -0,0 +1 @@
1

3
Tests/RunCMake/CommandLine/BuildDir--build-multiple-targets-stderr.txt Normal file
View File

@ -0,0 +1,3 @@
^'--target' may not be specified more than once\.
+
Usage: cmake --build <dir> \[options\] \[-- \[native-options\]\]

2
Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt
View File

@ -3,3 +3,5 @@ add_custom_command(
COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
)
add_custom_target(CustomTarget ALL DEPENDS output.txt)
add_custom_target(CustomTarget2 ALL DEPENDS output.txt)
add_custom_target(CustomTarget3 ALL DEPENDS output.txt)

2
Tests/RunCMake/CommandLine/RunCMakeTest.cmake
View File

@ -51,6 +51,8 @@ function(run_BuildDir)
run_cmake(BuildDir)
run_cmake_command(BuildDir--build ${CMAKE_COMMAND} -E chdir ..
${CMAKE_COMMAND} --build BuildDir-build --target CustomTarget)
run_cmake_command(BuildDir--build-multiple-targets ${CMAKE_COMMAND} -E chdir ..
${CMAKE_COMMAND} --build BuildDir-build --target CustomTarget2 --target CustomTarget3)
endfunction()
run_BuildDir()