Tests: Clean up Ninja Multi-Config test from cb777dd

18 files changed, 127 insertions, 6 deletions

diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
index 885ae13..7c100eb 100644
--- a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake
@@ -100,9 +100,8 @@ run_ninja(Simple release-file build-Release.ninja ${simpleexe_Release})
 run_cmake_build(Simple all-configs Release simplestatic:all)
 run_ninja(Simple default-build-file build.ninja simpleexe)
 run_cmake_build(Simple all-clean Release clean:all)
-run_ninja(Simple debug-in-release-graph-target build-Release.ninja simpleexe2:Debug)
-run_cmake_build(Simple all-clean Release clean:all)
 run_cmake_build(Simple debug-subdir Debug SimpleSubdir/all)
+run_ninja(Simple debug-in-release-graph-target build-Release.ninja simpleexe2:Debug)
 run_ninja(Simple release-in-minsizerel-graph-subdir build-MinSizeRel.ninja SimpleSubdir/all:Release)
 run_cmake_build(Simple all-subdir Release SimpleSubdir/all:all)
 run_ninja(Simple minsizerel-top build-MinSizeRel.ninja all)
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-all-subdir-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-all-subdir-build-check.cmake
index de4505c..0cb6ad2 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-all-subdir-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-all-subdir-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -14,6 +17,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -23,6 +29,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
@@ -32,6 +41,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-all-top-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-all-top-ninja-check.cmake
index c171e3d..d27c1ca 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-all-top-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-all-top-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -31,6 +37,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
@@ -44,6 +53,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-target-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-target-ninja-check.cmake
index 2f81bc0..8de8fde 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-target-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-target-ninja-check.cmake
@@ -2,6 +2,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
   INCLUDE
     ${GENERATED_FILES}
 
+    ${TARGET_FILE_simpleexe_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe_Debug}
+
     ${TARGET_FILE_simpleexe2_Debug}
     ${TARGET_OBJECT_FILES_simpleexe2_Debug}
 
@@ -12,9 +15,6 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_OBJECT_FILES_simpleobj_Debug}
 
   EXCLUDE
-    ${TARGET_FILE_simpleexe_Debug}
-
-    ${TARGET_OBJECT_FILES_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simplestatic_Debug}
 
     ${TARGET_OBJECT_FILES_simpleexe_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-top-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-top-build-check.cmake
index fe980fe..d2cb846 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-top-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-in-release-graph-top-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -27,6 +33,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
@@ -40,6 +49,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-subdir-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-subdir-build-check.cmake
index 6bb7773..6a0190f 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-debug-subdir-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-debug-subdir-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-all-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-all-ninja-check.cmake
index 4e6e654..aec10ee 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-all-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-all-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -31,6 +37,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-minsizerel-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-minsizerel-ninja-check.cmake
index c09ae65..b46a708 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-minsizerel-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-minsizerel-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-ninja-check.cmake
index 43213dd..9d124cd 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-default-build-file-clean-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -31,6 +37,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-minsizerel-top-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-minsizerel-top-ninja-check.cmake
index bf4be49..496d722 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-minsizerel-top-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-minsizerel-top-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -14,6 +17,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -23,6 +29,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
@@ -36,6 +45,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/Simple-release-in-minsizerel-graph-subdir-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/Simple-release-in-minsizerel-graph-subdir-ninja-check.cmake
index b6c77ab..29c0187 100644
--- a/Tests/RunCMake/NinjaMultiConfig/Simple-release-in-minsizerel-graph-subdir-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/Simple-release-in-minsizerel-graph-subdir-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -14,6 +17,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-all-in-release-graph-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-all-in-release-graph-build-check.cmake
index fee5951..67326d9 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-all-in-release-graph-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-all-in-release-graph-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -17,6 +20,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-relwithdebinfo-in-release-graph-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-relwithdebinfo-in-release-graph-build-check.cmake
index fee5951..67326d9 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-relwithdebinfo-in-release-graph-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleCrossConfigs-all-relwithdebinfo-in-release-graph-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -17,6 +20,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAlias-all-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAlias-all-ninja-check.cmake
index c171e3d..d27c1ca 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAlias-all-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAlias-all-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -18,6 +21,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -31,6 +37,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleexe_MinSizeRel}
 
+    ${TARGET_FILE_simpleexe2_MinSizeRel}
+    ${TARGET_OBJECT_FILES_simpleexe2_MinSizeRel}
+
     ${TARGET_FILE_simpleshared_MinSizeRel}
     ${TARGET_LINKER_FILE_simpleshared_MinSizeRel}
     ${TARGET_OBJECT_FILES_simpleshared_MinSizeRel}
@@ -44,6 +53,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-configs-build-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-configs-build-check.cmake
index 8ffdd20..4e4ec82 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-configs-build-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-configs-build-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -17,6 +20,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-relwithdebinfo-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-relwithdebinfo-ninja-check.cmake
index 9e5baf9..b1789b0 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-relwithdebinfo-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-all-relwithdebinfo-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Debug}
     ${TARGET_OBJECT_FILES_simpleexe_Debug}
 
+    ${TARGET_FILE_simpleexe2_Debug}
+    ${TARGET_OBJECT_FILES_simpleexe2_Debug}
+
     ${TARGET_FILE_simpleshared_Debug}
     ${TARGET_LINKER_FILE_simpleshared_Debug}
     ${TARGET_OBJECT_FILES_simpleshared_Debug}
@@ -17,6 +20,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_Release}
     ${TARGET_OBJECT_FILES_simpleexe_Release}
 
+    ${TARGET_FILE_simpleexe2_Release}
+    ${TARGET_OBJECT_FILES_simpleexe2_Release}
+
     ${TARGET_FILE_simpleshared_Release}
     ${TARGET_LINKER_FILE_simpleshared_Release}
     ${TARGET_OBJECT_FILES_simpleshared_Release}
@@ -29,6 +35,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-clean-configs-ninja-check.cmake b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-clean-configs-ninja-check.cmake
index 3829d3e..9016cf4 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-clean-configs-ninja-check.cmake
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleDefaultBuildAliasList-clean-configs-ninja-check.cmake
@@ -5,6 +5,9 @@ check_files("${RunCMake_TEST_BINARY_DIR}"
     ${TARGET_FILE_simpleexe_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleexe_RelWithDebInfo}
 
+    ${TARGET_FILE_simpleexe2_RelWithDebInfo}
+    ${TARGET_OBJECT_FILES_simpleexe2_RelWithDebInfo}
+
     ${TARGET_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_LINKER_FILE_simpleshared_RelWithDebInfo}
     ${TARGET_OBJECT_FILES_simpleshared_RelWithDebInfo}
diff --git a/Tests/RunCMake/NinjaMultiConfig/SimpleSubdir/CMakeLists.txt b/Tests/RunCMake/NinjaMultiConfig/SimpleSubdir/CMakeLists.txt
index 0ca6d02..d81f5ab 100644
--- a/Tests/RunCMake/NinjaMultiConfig/SimpleSubdir/CMakeLists.txt
+++ b/Tests/RunCMake/NinjaMultiConfig/SimpleSubdir/CMakeLists.txt
@@ -6,4 +6,3 @@ target_link_libraries(simpleexe PRIVATE simpleshared)
 
 add_executable(simpleexe2 ../main.c)
 target_link_libraries(simpleexe2 PRIVATE simpleshared $<TARGET_OBJECTS:simpleobj>)
-set_property(TARGET simpleexe2 PROPERTY EXCLUDE_FROM_ALL 1)