From 90a913750a5c007513ad532e2af16c7eee378165 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sun, 29 Jan 2023 22:33:44 -0600
Subject: [PATCH] Install build artifacts and upload

---
 .github/workflows/ci.yml | 16 ++++++++++++----
 CMakeLists.txt           |  2 +-
 scwx-qt/CMakeLists.txt   |  2 +-
 scwx-qt/scwx-qt.cmake    | 24 +++++++++++++++++++++++-
 4 files changed, 37 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e34746fe..053598a2 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -36,6 +36,7 @@ jobs:
             conan_compiler: Visual Studio
             conan_compiler_version: 17
             conan_compiler_runtime: MD
+            artifact_suffix: windows-x64
     runs-on: ${{ matrix.os }}
 
     steps:
@@ -45,7 +46,7 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v3
       with:
-        path: scwx
+        path: source
         submodules: recursive
 
     - name: Install Qt
@@ -73,7 +74,7 @@ jobs:
       run: |
         pip install conan
         conan profile new default --detect
-        conan install ./scwx/ `
+        conan install ./source/ `
           --remote conancenter `
           --build missing `
           --settings arch=${{ matrix.conan_arch }} `
@@ -87,11 +88,18 @@ jobs:
       run: |
         mkdir build
         cd build
-        cmake ../scwx/ `
+        cmake ../source/ `
           -G Ninja `
           -DCMAKE_BUILD_TYPE="${{ matrix.build_type }}" `
-          -DCMAKE_INSTALL_PREFIX="../install"
+          -DCMAKE_INSTALL_PREFIX="${{ github.workspace }}/supercell-wx"
         ninja supercell-wx wxtest
+        cmake --install . --component supercell-wx
+
+    - name: Upload Artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: supercell-wx-${{ matrix.artifact_suffix }}
+        path: ${{ github.workspace }}/supercell-wx/
 
     - name: Test Supercell Wx
       working-directory: ${{ github.workspace }}/build
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c25656d..04f208a9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 set(PROJECT_NAME supercell-wx)
 project(${PROJECT_NAME} C CXX)
 
diff --git a/scwx-qt/CMakeLists.txt b/scwx-qt/CMakeLists.txt
index 967fb747..f4e636e7 100644
--- a/scwx-qt/CMakeLists.txt
+++ b/scwx-qt/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 set_property(DIRECTORY
              APPEND
diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 3088aaa8..7b036086 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.20)
+cmake_minimum_required(VERSION 3.21)
 
 project(scwx-qt LANGUAGES CXX)
 
@@ -362,3 +362,25 @@ target_link_libraries(scwx-qt PUBLIC Qt${QT_VERSION_MAJOR}::Widgets
 
 target_link_libraries(supercell-wx PRIVATE scwx-qt
                                            wxdata)
+
+install(TARGETS supercell-wx
+                qmaplibregl
+        RUNTIME_DEPENDENCIES
+          PRE_EXCLUDE_REGEXES "api-ms-" "ext-ms-" "qt6"
+          POST_EXCLUDE_REGEXES ".*system32/.*\\.dll"
+        RUNTIME
+        COMPONENT supercell-wx)
+
+qt_generate_deploy_app_script(TARGET supercell-wx
+                              FILENAME_VARIABLE deploy_script_scwx
+                              NO_UNSUPPORTED_PLATFORM_ERROR)
+
+qt_generate_deploy_app_script(TARGET qmaplibregl
+                              FILENAME_VARIABLE deploy_script_qmaplibregl
+                              NO_UNSUPPORTED_PLATFORM_ERROR)
+
+install(SCRIPT ${deploy_script_scwx}
+        COMPONENT supercell-wx)
+
+install(SCRIPT ${deploy_script_qmaplibregl}
+        COMPONENT supercell-wx)