diff options
| author | Brad King <brad.king@kitware.com> | 2024-10-28 13:14:23 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-10-28 13:14:39 (GMT) |
| commit | f42962bfbf350fbcc0a9c5e9c80cdd75e9173b8b (patch) | |
| tree | ed498cd7c74a1897da3dcc28f87dfe27ffe3a134 /Tests | |
| parent | 7e7d1c6a46df5f9706a488e8ea9ed700d3f3d6d8 (diff) | |
| parent | 39fd396421d7b5012e8fb567710ea1c99d67eeab (diff) | |
| download | CMake-f42962bfbf350fbcc0a9c5e9c80cdd75e9173b8b.zip CMake-f42962bfbf350fbcc0a9c5e9c80cdd75e9173b8b.tar.gz CMake-f42962bfbf350fbcc0a9c5e9c80cdd75e9173b8b.tar.bz2 | |
Merge topic 'link-strategy' into release-3.31
39fd396421 LINK_LIBRARIES_STRATEGY: Rename strategies to clarify expectations
Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !9949
Diffstat (limited to 'Tests')
23 files changed, 12 insertions, 12 deletions
diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER.cmake deleted file mode 100644 index f3dc096..0000000 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMAKE_LINK_LIBRARIES_STRATEGY PRESERVE_ORDER) -include(Basic-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER.cmake deleted file mode 100644 index 8e62377..0000000 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER) -include(Basic-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout-dedup-reverse.txt index 7e46d1ba..7e46d1ba 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout-dedup-reverse.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout-dedup.txt index 7e46d1ba..7e46d1ba 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout-dedup.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout.txt index 7e46d1ba..7e46d1ba 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-run-stdout-dedup-reverse.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-run-stdout.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr-dedup-reverse.txt index b908fbc..b908fbc 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr-dedup-reverse.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr-dedup.txt index b908fbc..b908fbc 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr-dedup.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr.txt index b908fbc..b908fbc 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER-stderr-dedup-reverse.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY-stderr.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY.cmake new file mode 100644 index 0000000..ea38b5b --- /dev/null +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_FREELY.cmake @@ -0,0 +1,2 @@ +set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER_FREELY) +include(Basic-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout-dedup-reverse.txt index 7e46d1ba..7e46d1ba 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup-reverse.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout-dedup-reverse.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout-dedup.txt index 6ef12eb..6ef12eb 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout-dedup.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout.txt index 6ef12eb..6ef12eb 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-run-stdout-dedup.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-run-stdout.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup-reverse.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr-dedup-reverse.txt index 7d91bee..7d91bee 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup-reverse.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr-dedup-reverse.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr-dedup.txt index d4bccc4..d4bccc4 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr-dedup.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr-dedup.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr.txt index 7e9a1cd..7e9a1cd 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Basic-PRESERVE_ORDER-stderr.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY-stderr.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY.cmake new file mode 100644 index 0000000..12876b1 --- /dev/null +++ b/Tests/RunCMake/LinkLibrariesStrategy/Basic-REORDER_MINIMALLY.cmake @@ -0,0 +1,2 @@ +set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER_MINIMALLY) +include(Basic-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-PRESERVE_ORDER.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-PRESERVE_ORDER.cmake deleted file mode 100644 index 9f694db..0000000 --- a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-PRESERVE_ORDER.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMAKE_LINK_LIBRARIES_STRATEGY PRESERVE_ORDER) -include(Duplicate-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER.cmake deleted file mode 100644 index cc51e0a..0000000 --- a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER.cmake +++ /dev/null @@ -1,2 +0,0 @@ -set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER) -include(Duplicate-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_FREELY-stderr.txt index 2353288..2353288 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER-stderr.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_FREELY-stderr.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_FREELY.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_FREELY.cmake new file mode 100644 index 0000000..c205fad --- /dev/null +++ b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_FREELY.cmake @@ -0,0 +1,2 @@ +set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER_FREELY) +include(Duplicate-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-PRESERVE_ORDER-stderr.txt b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_MINIMALLY-stderr.txt index 2637f93..2637f93 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-PRESERVE_ORDER-stderr.txt +++ b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_MINIMALLY-stderr.txt diff --git a/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_MINIMALLY.cmake b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_MINIMALLY.cmake new file mode 100644 index 0000000..6d4545b --- /dev/null +++ b/Tests/RunCMake/LinkLibrariesStrategy/Duplicate-REORDER_MINIMALLY.cmake @@ -0,0 +1,2 @@ +set(CMAKE_LINK_LIBRARIES_STRATEGY REORDER_MINIMALLY) +include(Duplicate-common.cmake) diff --git a/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake b/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake index eb107ed..787b636 100644 --- a/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake +++ b/Tests/RunCMake/LinkLibrariesStrategy/RunCMakeTest.cmake @@ -44,8 +44,8 @@ function(run_strategy case exe) endforeach() endfunction() -run_strategy(Basic-PRESERVE_ORDER "main") -run_strategy(Basic-REORDER "main") +run_strategy(Basic-REORDER_MINIMALLY "main") +run_strategy(Basic-REORDER_FREELY "main") -run_cmake(Duplicate-PRESERVE_ORDER) -run_cmake(Duplicate-REORDER) +run_cmake(Duplicate-REORDER_MINIMALLY) +run_cmake(Duplicate-REORDER_FREELY) |