mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'ninja-windows-command-concat'

Browse Source 
5e0e03d9 Ninja: Fix command concatenation on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !801
This commit is contained in:
Brad King
2017-05-10 13:23:39 +00:00
committed by Kitware Robot
parent 53f1f55599 5e0e03d953
commit 8a19ce4767
3 changed files with 31 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalNinjaGenerator.cxx
+7 -1
View File
@@ -322,7 +322,13 @@ std::string cmLocalNinjaGenerator::BuildCommandLine(
} else if (cmdLines.size() > 1) {
cmd << "cmd.exe /C \"";
}
cmd << *li;
// Put current cmdLine in brackets if it contains "||" because it has
// higher precedence than "&&" in cmd.exe
if (li->find("||") != std::string::npos) {
cmd << "( " << *li << " )";
} else {
cmd << *li;
}
}
if (cmdLines.size() > 1) {
cmd << "\"";
Tests/RunCMake/Ninja/CommandConcat.cmake
+14
View File
@@ -0,0 +1,14 @@
cmake_minimum_required(VERSION 3.7)
project(concat_cmd NONE)
set(output1 ${CMAKE_BINARY_DIR}/out1.txt)
set(output2 ${CMAKE_BINARY_DIR}/out2.txt)
file(REMOVE ${output1} ${output2})
# Check that second command runs if first command contains "||" which has higher precedence than "&&" on Windows
add_custom_target(concat_cmd ALL
COMMAND ${CMAKE_COMMAND} -E echo "Hello || pipe world" && ${CMAKE_COMMAND} -E touch ${output1} || exit 1
COMMAND ${CMAKE_COMMAND} -E touch ${output2})
# Check output
add_custom_target(check_output ALL
COMMAND ${CMAKE_COMMAND} -E copy ${output1} ${output1}.copy
COMMAND ${CMAKE_COMMAND} -E copy ${output2} ${output2}.copy)
add_dependencies(check_output concat_cmd)
Tests/RunCMake/Ninja/RunCMakeTest.cmake
+10
View File
@@ -40,6 +40,16 @@ run_CMP0058(NEW-by)
run_cmake(CustomCommandDepfile)
function(run_CommandConcat)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/CommandConcat-build)
set(RunCMake_TEST_NO_CLEAN 1)
file(REMOVE_RECURSE "${RunCMake_TEST_BINARY_DIR}")
file(MAKE_DIRECTORY "${RunCMake_TEST_BINARY_DIR}")
run_cmake(CommandConcat)
run_cmake_command(CommandConcat-build ${CMAKE_COMMAND} --build .)
endfunction()
run_CommandConcat()
function(run_SubDir)
# Use a single build tree for a few tests without cleaning.
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/SubDir-build)