Browse Source

Tests/RunCMake/BuildDepends: Simplify CustomCommandDepends case

Also rename from "CustomCommandDependencies".
Brad King 1 year ago
parent
commit
b751a857cc

+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-result.txt → Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs-result.txt


+ 1 - 1
Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs-stderr.txt → 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\)

+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies-BadArgs.cmake → Tests/RunCMake/BuildDepends/CustomCommandDepends-BadArgs.cmake


+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies-compiler-deps-legacy.cmake → Tests/RunCMake/BuildDepends/CustomCommandDepends-compiler-deps-legacy.cmake


+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies.cmake → Tests/RunCMake/BuildDepends/CustomCommandDepends.cmake


+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies.step1.cmake → Tests/RunCMake/BuildDepends/CustomCommandDepends.step1.cmake


+ 0 - 0
Tests/RunCMake/BuildDepends/CustomCommandDependencies.step2.cmake → Tests/RunCMake/BuildDepends/CustomCommandDepends.step2.cmake


+ 4 - 4
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()