diff options
| author | Brad King <brad.king@kitware.com> | 2021-06-10 12:23:39 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-06-10 12:23:45 (GMT) |
| commit | 5fd68d3ef75d590da383b5189ee7f952bd560a30 (patch) | |
| tree | 7ece5b57c9c6177c18b4c4cca235312d39ccb3e0 /Tests | |
| parent | cf85c6bf85398213d965a41f81b604142456bd23 (diff) | |
| parent | 526e2ef71c5b797818bbf232e21d0152a3938197 (diff) | |
| download | CMake-5fd68d3ef75d590da383b5189ee7f952bd560a30.zip CMake-5fd68d3ef75d590da383b5189ee7f952bd560a30.tar.gz CMake-5fd68d3ef75d590da383b5189ee7f952bd560a30.tar.bz2 | |
Merge topic 'vs-custom-depfile'
526e2ef71c VS: Add support for add_custom_command DEPFILE
794ad78abb Help: Generalize release note filename for add_custom_command DEPFILE
7291f31254 cmTransformDepfile: Add support for MSBuild AdditionalInputs format
a6de8ec51b cmTransformDepfile: Make directory for transformed depfile automatically
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6206
Diffstat (limited to 'Tests')
| -rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 0a80580..f8c20c2 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -172,7 +172,8 @@ if (RunCMake_GENERATOR MATCHES "Makefiles") run_cmake(CustomCommandDependencies-BadArgs) endif() -if(RunCMake_GENERATOR MATCHES "Make|Ninja|Xcode") +if(RunCMake_GENERATOR MATCHES "Make|Ninja|Visual Studio|Xcode" AND + NOT RunCMake_GENERATOR MATCHES "Visual Studio (9|10)( |$)") unset(run_BuildDepends_skip_step_3) run_BuildDepends(CustomCommandDepfile) set(run_BuildDepends_skip_step_3 1) |