From 5f24ee6f2795457e8e66fb5772194b09cc284337 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Tue, 23 Apr 2024 15:49:13 -0400 Subject: [PATCH] Possibly fix ECM build --- .github/workflows/cmake-multi-platform.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index fdc7f14..fcc1439 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -35,18 +35,22 @@ jobs: c_compiler: cl steps: - - uses: actions/checkout@v4 - with: - repository: 'https://invent.kde.org/frameworks/extra-cmake-modules.git' - ref: 'v6.1.0' + - name: Clone ECM + run: | + git clone https://invent.kde.org/frameworks/extra-cmake-modules.git - - name: Configure CMake + - name: Build and install ECM run: > - cmake -B ${{ steps.strings.outputs.build-output-dir }} + cmake -B ${{ steps.strings.outputs.build-output-dir }}-ECM -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} - -S ${{ github.workspace }} + -S ${{ github.workspace }}/extra-cmake-modules + cmake -I ${{ steps.strings.outputs.build-output-dir }}-ECM + -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} + -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} + -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -S ${{ github.workspace }}/extra-cmake-modules - uses: actions/checkout@v3