diff options
author | Brad King <brad.king@kitware.com> | 2024-09-12 13:56:26 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2024-09-12 16:24:48 (GMT) |
commit | b751a857cc2f8cc3a5e4c511193a1e19cc8c8116 (patch) | |
tree | 81667840b29e0e08b3e9ac62eaaa11e1b765fb8a /Tests/RunCMake/BuildDepends | |
parent | 006891dab90ea72f634e83858a600aa61a40d004 (diff) | |
download | CMake-b751a857cc2f8cc3a5e4c511193a1e19cc8c8116.zip CMake-b751a857cc2f8cc3a5e4c511193a1e19cc8c8116.tar.gz CMake-b751a857cc2f8cc3a5e4c511193a1e19cc8c8116.tar.bz2 |
Tests/RunCMake/BuildDepends: Simplify CustomCommandDepends case
Also rename from "CustomCommandDependencies".
Diffstat (limited to 'Tests/RunCMake/BuildDepends')
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt) | 2 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake (renamed from Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake) | 0 | ||||
-rw-r--r-- | Tests/RunCMake/BuildDepends/RunCMakeTest.cmake | 8 |
8 files changed, 5 insertions, 5 deletions
diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt index d00491f..d00491f 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt index cddea3c..03a5a75 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-stderr.txt @@ -1,4 +1,4 @@ -CMake Error at CustomCommandDependencies-BadArgs.cmake:[0-9]+ \(add_custom_command\): +CMake Error at CustomCommandDepends-BadArgs.cmake:[0-9]+ \(add_custom_command\): add_custom_command IMPLICIT_DEPENDS and DEPFILE can not both be specified. Call Stack \(most recent call first\): CMakeLists.txt:[0-9]+ \(include\) diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake index 91ee338..91ee338 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake index e13efb3..e13efb3 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake index 28bbf11..28bbf11 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake index 87576eb..87576eb 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake diff --git a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake index 69b21b8..69b21b8 100644 --- a/Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake +++ b/Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake diff --git a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake index 3df419a..bc9d57f 100644 --- a/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake +++ b/Tests/RunCMake/BuildDepends/RunCMakeTest.cmake @@ -172,14 +172,14 @@ if ((RunCMake_GENERATOR STREQUAL "Unix Makefiles" AND MSVC_VERSION GREATER 1300 AND CMAKE_C_COMPILER_ID STREQUAL "MSVC")) run_BuildDepends(CompileDepends) - run_BuildDepends(CustomCommandDependencies) + run_BuildDepends(CustomCommandDepends) endif() if (RunCMake_GENERATOR MATCHES "Makefiles") - run_cmake(CustomCommandDependencies-BadArgs) - run_cmake_with_options(CustomCommandDependencies-compiler-deps-legacy -DCMAKE_DEPENDS_USE_COMPILER=FALSE) + run_cmake(CustomCommandDepends-BadArgs) + run_cmake_with_options(CustomCommandDepends-compiler-deps-legacy -DCMAKE_DEPENDS_USE_COMPILER=FALSE) set(RunCMake_TEST_NO_CLEAN 1) - run_cmake_command(CustomCommandDependencies-compiler-deps-legacy ${CMAKE_COMMAND} --build . --config Debug) + run_cmake_command(CustomCommandDepends-compiler-deps-legacy ${CMAKE_COMMAND} --build . --config Debug) unset(RunCMake_TEST_NO_CLEAN) endif() |