diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml index 42beedc..d022f9d 100644 --- a/.github/workflows/cmake-multi-platform.yml +++ b/.github/workflows/cmake-multi-platform.yml @@ -49,24 +49,24 @@ jobs: echo "prefix-dir=${{ github.workspace }}/prefix" >> "$GITHUB_OUTPUT" - name: Clone Extra CMake Modules - if: runner.os == 'Windows' + if: runner.os == 'windows-latest' run: | git clone https://invent.kde.org/frameworks/extra-cmake-modules.git - name: Build and install Extra CMake Modules - if: runner.os == 'Windows' + if: runner.os == 'windows-latest' run: | cmake -B ${{ steps.strings.outputs.build-output-dir }}-ECM -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S extra-cmake-modules -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF cmake --build ${{ steps.strings.outputs.build-output-dir }}-ECM cmake --install ${{ steps.strings.outputs.build-output-dir }}-ECM - name: Clone KCoreAddons - if: runner.os == 'Windows' + if: runner.os == 'windows-latest' run: | git clone https://invent.kde.org/frameworks/kcoreaddons.git - name: Build and install KCoreAddons - if: runner.os == 'Windows' + if: runner.os == 'windows-latest' run: | cmake -B ${{ steps.strings.outputs.build-output-dir }}-kca -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} -S kcoreaddons -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF cmake --build ${{ steps.strings.outputs.build-output-dir }}-kca @@ -80,6 +80,7 @@ jobs: -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }} -DCMAKE_C_COMPILER=${{ matrix.c_compiler }} -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} + -DCMAKE_PREFIX_PATH=${{ steps.strings.outputs.prefix-dir }} -S ${{ github.workspace }} - name: Build