From cdfd0615b85e8847f976b084998d233c0fe0a5ab Mon Sep 17 00:00:00 2001 From: Lee Cantey Date: Tue, 27 Oct 2026 12:31:30 -0700 Subject: [PATCH] Tests/RunCMake/target_link_libraries-LINK_LIBRARY: Fix MinGW lld check With ORDER=FORWARD link processing, the override-features2 check expects the non-target library other1 with the import library prefix and suffix, which for MinGW is libother1.dll.a. It is linked by its name, as the check already expects without ORDER=FORWARD. Match it the same way. ORDER=FORWARD is set for MSVC, whose expected pattern does not change, and for lld with the GNU command-line frontend, as in llvm-mingw. --- .../LINK_LIBRARY-CMP0156-NEW-override-features2-check.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY-CMP0156-NEW-override-features2-check.cmake b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY-CMP0156-NEW-override-features2-check.cmake index 817b6e2d8a..f6e01c4c1e 100644 --- a/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY-CMP0156-NEW-override-features2-check.cmake +++ b/Tests/RunCMake/target_link_libraries-LINK_LIBRARY/LINK_LIBRARY-CMP0156-NEW-override-features2-check.cmake @@ -2,7 +2,7 @@ include("${RunCMake_BINARY_DIR}/LINK_LIBRARY-CMP0156-NEW-build/LIBRARIES_PROCESSING.cmake") if (CMAKE_C_LINK_LIBRARIES_PROCESSING MATCHES "ORDER=FORWARD") - if (NOT actual_stdout MATCHES "(/|-)-PREFIXGROUP\"? +\"?(/|-)-LIBGROUP.*${LINK_SHARED_LIBRARY_PREFIX}base1${LINK_SHARED_LIBRARY_SUFFIX}\"? +\"?(/|-)-SUFFIXGROUP\"? +\"?(/|-)-LIBFLAG.*${LINK_SHARED_LIBRARY_PREFIX}base3${LINK_SHARED_LIBRARY_SUFFIX}\"? +\"?(/|-)-PREFIXGROUP\"? +\"?(/|-)-LIBGROUP.*${LINK_SHARED_LIBRARY_PREFIX}other1${LINK_SHARED_LIBRARY_SUFFIX}\"? +\"?(/|-)-SUFFIXGROUP") + if (NOT actual_stdout MATCHES "(/|-)-PREFIXGROUP\"? +\"?(/|-)-LIBGROUP.*${LINK_SHARED_LIBRARY_PREFIX}base1${LINK_SHARED_LIBRARY_SUFFIX}\"? +\"?(/|-)-SUFFIXGROUP\"? +\"?(/|-)-LIBFLAG.*${LINK_SHARED_LIBRARY_PREFIX}base3${LINK_SHARED_LIBRARY_SUFFIX}\"? +\"?(/|-)-PREFIXGROUP\"? +\"?(/|-)-LIBGROUP.*other1${LINK_EXTERN_LIBRARY_SUFFIX}\"? +\"?(/|-)-SUFFIXGROUP") set (RunCMake_TEST_FAILED "Not found expected '--PREFIXGROUP --LIBGROUP --SUFFIXGROUP --LIBFLAG --PREFIXGROUP --LIBGROUP --SUFFIXGROUP'.") endif() else()