diff --git a/Help/release/dev/cmake-install-j-no-space.rst b/Help/release/dev/cmake-install-j-no-space.rst new file mode 100644 index 0000000000..e3d34111f0 --- /dev/null +++ b/Help/release/dev/cmake-install-j-no-space.rst @@ -0,0 +1,5 @@ +cmake-install-j-no-space +------------------------ + +* :option:`cmake --install` now accepts ``-j`` in addition to ``-j `` + for specifying the number of parallel jobs. diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx index bb943f549d..680573b60b 100644 --- a/Source/cmakemain.cxx +++ b/Source/cmakemain.cxx @@ -840,7 +840,8 @@ int do_install(int ac, char const* const* av) CommandArgument{ "--default-directory-permissions", CommandArgument::Values::One, CommandArgument::setToValue(defaultDirectoryPermissions) }, - CommandArgument{ "-j", CommandArgument::Values::One, jLambda }, + CommandArgument{ "-j", CommandArgument::Values::One, + CommandArgument::RequiresSeparator::No, jLambda }, CommandArgument{ "--parallel", CommandArgument::Values::One, parallelLambda }, CommandArgument{ "--prefix", CommandArgument::Values::One, diff --git a/Tests/RunCMake/InstallParallel/RunCMakeTest.cmake b/Tests/RunCMake/InstallParallel/RunCMakeTest.cmake index b7a059b5f2..d491b66546 100644 --- a/Tests/RunCMake/InstallParallel/RunCMakeTest.cmake +++ b/Tests/RunCMake/InstallParallel/RunCMakeTest.cmake @@ -48,6 +48,7 @@ function(install_test test) endfunction() install_test(parallel PARALLEL ARGS "-j 4") +install_test(parallel-no-space PARALLEL ARGS "-j4") install_test(no-parallel ARGS "-j 4") install_test(out-of-date-json TOUCH_CACHE PARALLEL ARGS "-j 4") install_test(component PARALLEL ARGS "-j 4" COMPONENT "ALPHANUMERIC123") diff --git a/Tests/RunCMake/InstallParallel/parallel-no-space-install-stdout.txt b/Tests/RunCMake/InstallParallel/parallel-no-space-install-stdout.txt new file mode 100644 index 0000000000..9c059b0f20 --- /dev/null +++ b/Tests/RunCMake/InstallParallel/parallel-no-space-install-stdout.txt @@ -0,0 +1,15 @@ +\[1\/5\] .* +\-\- Installing:[^ +]* +\[2\/5\] .* +\-\- Installing:[^ +]* +\[3\/5\] .* +\-\- Installing:[^ +]* +\[4\/5\] .* +\-\- Installing:[^ +]* +\[5\/5\] .* +\-\- Installing:[^ +]*