Don't force linker choice in test suite CMakeLists.txt

Author: Morwenn

.github/workflows/build-ubuntu.yml

@@ -28,9 +28,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        cxx:
-          - g++-9
-          - clang++-11
+        build:
+          - compiler: g++-9
+            linker: GOLD
+          - compiler: clang++-11
+            linker: LLD
         config:
           # Release build
           - build_type: Release
@@ -44,11 +46,11 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install GCC
-        if: ${{matrix.cxx == 'g++-9'}}
+        if: ${{matrix.build.compiler == 'g++-9'}}
         run: sudo apt-get install -y g++-9
 
       - name: Install Clang
-        if: ${{matrix.cxx == 'clang++-11'}}
+        if: ${{matrix.build.compiler == 'clang++-11'}}
         run: sudo apt-get install -y clang-11 lld-11
 
       - name: Install Valgrind
@@ -58,15 +60,16 @@ jobs:
       - name: Configure CMake
         working-directory: ${{runner.workspace}}
         env:
-          CXX: ${{matrix.cxx}}
+          CXX: ${{matrix.build.compiler}}
         run: |
-          cmake -H${{github.event.repository.name}} -Bbuild \
+          cmake -S ${{github.event.repository.name}} -B build \
                 -DCMAKE_CONFIGURATION_TYPES=${{matrix.config.build_type}} \
                 -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} \
+                -DCMAKE_LINKER_TYPE=${{matrix.build.linker}} \
                 -DCPPSORT_SANITIZE=${{matrix.config.sanitize}} \
                 -DCPPSORT_USE_VALGRIND=${{matrix.config.valgrind}} \
-                -G"Unix Makefiles" \
-                -DCPPSORT_BUILD_EXAMPLES=ON
+                -DCPPSORT_BUILD_EXAMPLES=ON \
+                -G"Unix Makefiles"
 
       - name: Build the test suite
         shell: bash

.github/workflows/code-coverage.yml

@@ -32,8 +32,9 @@ jobs:
         shell: bash
         working-directory: ${{runner.workspace}}
         run: >
-          cmake -H${{github.event.repository.name}} -Bbuild
+          cmake -S ${{github.event.repository.name}} -B build
           -DCMAKE_BUILD_TYPE=Debug
+          -DCMAKE_LINKER_TYPE=GOLD
           -DCPPSORT_ENABLE_COVERAGE=ON
           -DGENINFO_EXTRA_FLAGS="--ignore-errors mismatch,mismatch"
           -DLCOV_EXTRA_FLAGS="--ignore-errors unused"

tests/CMakeLists.txt

@@ -110,15 +110,6 @@ macro(configure_tests target)
         $<$<AND:$<CONFIG:Debug>,$<CXX_COMPILER_ID:GNU>>:-Og>
     )
 
-    # Use lld or the gold linker if possible
-    if (UNIX AND NOT APPLE)
-        if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-            set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-ld=lld")
-        else()
-            set_property(TARGET ${target} APPEND_STRING PROPERTY LINK_FLAGS " -fuse-ld=gold")
-        endif()
-    endif()
-
     # Optionally enable sanitizers
     if (UNIX AND CPPSORT_SANITIZE)
         target_compile_options(${target} PRIVATE