From 861dbf717e1023d3e3c8e801e6bdf24adaaace94 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 23 Apr 2024 16:58:53 -0400
Subject: [PATCH] Try to use target install

---
 .github/workflows/cmake-multi-platform.yml | 25 +++++-----------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
index 6059ac9..feeaf48 100644
--- a/.github/workflows/cmake-multi-platform.yml
+++ b/.github/workflows/cmake-multi-platform.yml
@@ -41,50 +41,35 @@ jobs:
         echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
         echo "prefix-dir=${{ github.workspace }}/prefix" >> "$GITHUB_OUTPUT"
 
-    # Why does Windows need this?
-    - name: Clear old build directiories
-      if: matrix.os == 'windows-latest'
-      run: |
-        Remove-Item -LiteralPath "${{ steps.strings.outputs.build-output-dir }}-ECM" -Force -Recurse -ErrorAction Ignore
-        Remove-Item -LiteralPath "${{ steps.strings.outputs.build-output-dir }}-kca" -Force -Recurse -ErrorAction Ignore
-        Remove-Item -LiteralPath "${{ steps.strings.outputs.build-output-dir }}-kconfig" -Force -Recurse -ErrorAction Ignore
-        Remove-Item -LiteralPath "${{ steps.strings.outputs.build-output-dir }}-karchive" -Force -Recurse -ErrorAction Ignore
-
     - name: Build and install Extra CMake Modules
       run: |
         git clone https://invent.kde.org/frameworks/extra-cmake-modules.git
         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
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}-ECM --target install
 
     - name: Build and install KCoreAddons
       run: |
         git clone https://invent.kde.org/frameworks/kcoreaddons.git
         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
-        cmake --install ${{ steps.strings.outputs.build-output-dir }}-kca
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}-kca --target install
 
     - name: Build and install KConfig
       run: |
         git clone https://invent.kde.org/frameworks/kconfig.git
         cmake -B ${{ steps.strings.outputs.build-output-dir }}-kconfig -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 kconfig -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF
-        cmake --build ${{ steps.strings.outputs.build-output-dir }}-kconfig
-        cmake --install ${{ steps.strings.outputs.build-output-dir }}-kconfig
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}-kconfig --target install
 
     - name: Build and install KArchive
       run: |
         git clone https://invent.kde.org/frameworks/karchive.git
         cmake -B ${{ steps.strings.outputs.build-output-dir }}-karchive -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 karchive -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF
-        cmake --build ${{ steps.strings.outputs.build-output-dir }}-karchive
-        cmake --install ${{ steps.strings.outputs.build-output-dir }}-karchive
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}-karchive --target install
 
     - name: Build and install KI18n
       run: |
         git clone https://invent.kde.org/frameworks/ki18n.git
         cmake -B ${{ steps.strings.outputs.build-output-dir }}-ki18n -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 ki18n -DCMAKE_INSTALL_PREFIX=${{ steps.strings.outputs.prefix-dir }} -DBUILD_TESTING=OFF
-        cmake --build ${{ steps.strings.outputs.build-output-dir }}-ki18n
-        cmake --install ${{ steps.strings.outputs.build-output-dir }}-ki18n
-
+        cmake --build ${{ steps.strings.outputs.build-output-dir }}-ki18n --target install
 
     - uses: actions/checkout@v3