diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2021-01-16 16:37:23 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2021-01-19 12:17:14 (GMT) |
| commit | b5c2163293c08e8e53203d86a069713e06874886 (patch) | |
| tree | f3d6d249054fee14b6e0122bc021be958c59b3dd /Tests/RunCMake/TransformDepfile | |
| parent | 5b9f7a5f285d648698068abe8eb238cd4dda7161 (diff) | |
| download | CMake-b5c2163293c08e8e53203d86a069713e06874886.zip CMake-b5c2163293c08e8e53203d86a069713e06874886.tar.gz CMake-b5c2163293c08e8e53203d86a069713e06874886.tar.bz2 | |
Ninja: add_custom_command(DEPFILE): Ensure dependencies consistency
Fixes: #21694
Diffstat (limited to 'Tests/RunCMake/TransformDepfile')
7 files changed, 20 insertions, 20 deletions
diff --git a/Tests/RunCMake/TransformDepfile/RunCMakeTest.cmake b/Tests/RunCMake/TransformDepfile/RunCMakeTest.cmake index cb75eb0..9a38b95 100644 --- a/Tests/RunCMake/TransformDepfile/RunCMakeTest.cmake +++ b/Tests/RunCMake/TransformDepfile/RunCMakeTest.cmake @@ -3,11 +3,11 @@ include(RunCMake) function(run_transform_depfile name) set(RunCMake-check-file gccdepfile.cmake) run_cmake_command(${name}-gcc - ${CMAKE_COMMAND} -E cmake_transform_depfile gccdepfile ../ ${CMAKE_CURRENT_LIST_DIR}/${name}.d out.d + ${CMAKE_COMMAND} -E cmake_transform_depfile "${RunCMake_GENERATOR}" gccdepfile "${RunCMake_SOURCE_DIR}" "${RunCMake_SOURCE_DIR}/subdir" "${RunCMake_BINARY_DIR}" "${RunCMake_BINARY_DIR}/subdir" "${CMAKE_CURRENT_LIST_DIR}/${name}.d" out.d ) set(RunCMake-check-file vstlog.cmake) run_cmake_command(${name}-tlog - ${CMAKE_COMMAND} -E cmake_transform_depfile vstlog ../ ${CMAKE_CURRENT_LIST_DIR}/${name}.d out.tlog + ${CMAKE_COMMAND} -E cmake_transform_depfile "${RunCMake_GENERATOR}" vstlog "${RunCMake_SOURCE_DIR}" "${RunCMake_SOURCE_DIR}/subdir" "${RunCMake_BINARY_DIR}" "${RunCMake_BINARY_DIR}/subdir" "${CMAKE_CURRENT_LIST_DIR}/${name}.d" out.tlog ) endfunction() diff --git a/Tests/RunCMake/TransformDepfile/deps-unix.d.txt b/Tests/RunCMake/TransformDepfile/deps-unix.d.txt index 58770f2..fbdecc0 100644 --- a/Tests/RunCMake/TransformDepfile/deps-unix.d.txt +++ b/Tests/RunCMake/TransformDepfile/deps-unix.d.txt @@ -1,8 +1,8 @@ -../out1 \ +subdir/out1 \ /home/build/out2: \ - ../in1 \ + subdir/in1 \ /home/build/in2 -../out3 \ +subdir/out3 \ /home/build/out4: \ - ../in3 \ + subdir/in3 \ /home/build/in4 diff --git a/Tests/RunCMake/TransformDepfile/deps-unix.tlog.txt b/Tests/RunCMake/TransformDepfile/deps-unix.tlog.txt index 2a26edf..70bac5d 100644 --- a/Tests/RunCMake/TransformDepfile/deps-unix.tlog.txt +++ b/Tests/RunCMake/TransformDepfile/deps-unix.tlog.txt @@ -1,6 +1,6 @@ -^../out1|/home/build/out2 -../in1 +^subdir/out1|/home/build/out2 +subdir/in1 /home/build/in2 -^../out3|/home/build/out4 -../in3 +^subdir/out3|/home/build/out4 +subdir/in3 /home/build/in4 diff --git a/Tests/RunCMake/TransformDepfile/deps-windows.d.txt b/Tests/RunCMake/TransformDepfile/deps-windows.d.txt index 47b3ebf..e09ae37 100644 --- a/Tests/RunCMake/TransformDepfile/deps-windows.d.txt +++ b/Tests/RunCMake/TransformDepfile/deps-windows.d.txt @@ -1,8 +1,8 @@ -../out1 \ +subdir/out1 \ C:/build/out2: \ - ../in1 \ + subdir/in1 \ C:/build/in2 -../out3 \ +subdir/out3 \ C:/build/out4: \ - ../in3 \ + subdir/in3 \ C:/build/in4 diff --git a/Tests/RunCMake/TransformDepfile/deps-windows.tlog.txt b/Tests/RunCMake/TransformDepfile/deps-windows.tlog.txt index 1e6024d..09f9e97 100644 --- a/Tests/RunCMake/TransformDepfile/deps-windows.tlog.txt +++ b/Tests/RunCMake/TransformDepfile/deps-windows.tlog.txt @@ -1,6 +1,6 @@ -^..\out1|C:\build\out2 -..\in1 +^subdir\out1|C:\build\out2 +subdir\in1 C:\build\in2 -^..\out3|C:\build\out4 -..\in3 +^subdir\out3|C:\build\out4 +subdir\in3 C:\build\in4 diff --git a/Tests/RunCMake/TransformDepfile/invalid-gcc-result.txt b/Tests/RunCMake/TransformDepfile/invalid-gcc-result.txt index d00491f..0cfbf08 100644 --- a/Tests/RunCMake/TransformDepfile/invalid-gcc-result.txt +++ b/Tests/RunCMake/TransformDepfile/invalid-gcc-result.txt @@ -1 +1 @@ -1 +2 diff --git a/Tests/RunCMake/TransformDepfile/invalid-tlog-result.txt b/Tests/RunCMake/TransformDepfile/invalid-tlog-result.txt index d00491f..0cfbf08 100644 --- a/Tests/RunCMake/TransformDepfile/invalid-tlog-result.txt +++ b/Tests/RunCMake/TransformDepfile/invalid-tlog-result.txt @@ -1 +1 @@ -1 +2 |