From 08131e83bcac840e2d550acff936534914d5435c Mon Sep 17 00:00:00 2001 From: Kyle Edwards Date: Fri, 23 Jul 2021 13:22:59 -0400 Subject: [PATCH] Tests: Clean up Ninja Multi-Config test from cb777dd --- Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake | 3 +-- .../Simple-all-subdir-build-check.cmake | 12 ++++++++++++ .../Simple-all-top-ninja-check.cmake | 12 ++++++++++++ ...e-debug-in-release-graph-target-ninja-check.cmake | 6 +++--- ...mple-debug-in-release-graph-top-build-check.cmake | 12 ++++++++++++ .../Simple-debug-subdir-build-check.cmake | 3 +++ .../Simple-default-build-file-all-ninja-check.cmake | 9 +++++++++ ...ult-build-file-clean-minsizerel-ninja-check.cmake | 6 ++++++ ...Simple-default-build-file-clean-ninja-check.cmake | 9 +++++++++ .../Simple-minsizerel-top-ninja-check.cmake | 12 ++++++++++++ ...ease-in-minsizerel-graph-subdir-ninja-check.cmake | 6 ++++++ ...onfigs-all-all-in-release-graph-build-check.cmake | 6 ++++++ ...relwithdebinfo-in-release-graph-build-check.cmake | 6 ++++++ .../SimpleDefaultBuildAlias-all-ninja-check.cmake | 12 ++++++++++++ ...faultBuildAliasList-all-configs-build-check.cmake | 6 ++++++ ...ildAliasList-all-relwithdebinfo-ninja-check.cmake | 9 +++++++++ ...ultBuildAliasList-clean-configs-ninja-check.cmake | 3 +++ .../NinjaMultiConfig/SimpleSubdir/CMakeLists.txt | 1 - 18 files changed, 127 insertions(+), 6 deletions(-) diff --git a/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake b/Tests/RunCMake/NinjaMultiConfig/RunCMakeTest.cmake index 885ae13de8..7c100eb1ea 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 de4505ccc0..0cb6ad2e53 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 c171e3d057..d27c1ca9be 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 2f81bc0533..8de8fde9dd 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 fe980fea67..d2cb8461f1 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 6bb7773fd2..6a0190ffcb 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 4e6e654417..aec10eefcb 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 c09ae65b95..b46a708d82 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 43213dd013..9d124cdb0f 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 bf4be49271..496d722463 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 b6c77abf26..29c0187ed2 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 fee5951c4e..67326d9c34 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 fee5951c4e..67326d9c34 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 c171e3d057..d27c1ca9be 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 8ffdd20b55..4e4ec82cf0 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 9e5baf91a9..b1789b01b0 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 3829d3e525..9016cf4ac8 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 0ca6d02368..d81f5ab6e9 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 $) -set_property(TARGET simpleexe2 PROPERTY EXCLUDE_FROM_ALL 1)