瀏覽代碼

Tests: Update RunCMake.CommandLine to avoid duplicate custom commands

This test does not need to have the same custom command output generated
by multiple independent targets.  Revise the test to avoid that.
Brad King 5 年之前
父節點
當前提交
266f97315b

+ 16 - 5
Tests/RunCMake/CommandLine/BuildDir/CMakeLists.txt

@@ -1,8 +1,19 @@
 add_custom_command(
-  OUTPUT output.txt
-  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
+  OUTPUT output1.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output1.txt
   )
-add_custom_target(CustomTarget ALL DEPENDS output.txt)
-add_custom_target(CustomTarget2 ALL DEPENDS output.txt)
-add_custom_target(CustomTarget3 ALL DEPENDS output.txt)
+add_custom_target(CustomTarget ALL DEPENDS output1.txt)
+
+add_custom_command(
+  OUTPUT output2.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output2.txt
+  )
+add_custom_target(CustomTarget2 ALL DEPENDS output2.txt)
+
+add_custom_command(
+  OUTPUT output3.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output3.txt
+  )
+add_custom_target(CustomTarget3 ALL DEPENDS output3.txt)
+
 add_custom_target(CustomTargetFail COMMAND DoesNotExist)

+ 16 - 5
Tests/RunCMake/CommandLine/ExplicitDirs/CMakeLists.txt

@@ -1,9 +1,20 @@
 cmake_minimum_required(VERSION 3.14)
 project(ExplicitDirs NONE)
+
 add_custom_command(
-  OUTPUT output.txt
-  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output.txt
+  OUTPUT output1.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand > output1.txt
   )
-add_custom_target(CustomTarget ALL DEPENDS output.txt)
-add_custom_target(CustomTarget2 ALL DEPENDS output.txt)
-add_custom_target(CustomTarget3 ALL DEPENDS output.txt)
+add_custom_target(CustomTarget ALL DEPENDS output1.txt)
+
+add_custom_command(
+  OUTPUT output2.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output2.txt
+  )
+add_custom_target(CustomTarget2 ALL DEPENDS output2.txt)
+
+add_custom_command(
+  OUTPUT output3.txt
+  COMMAND ${CMAKE_COMMAND} -E echo CustomCommand2 > output3.txt
+  )
+add_custom_target(CustomTarget3 ALL DEPENDS output3.txt)