Move to VCPKG.

Author: Holt59

.github/workflows/build.yml

@@ -1,16 +1,47 @@
-name: Build Installer Quick Plugin
+name: Build Installer Quick
 
 on:
   push:
     branches: master
   pull_request:
     types: [opened, synchronize, reopened]
 
+env:
+  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
+
 jobs:
   build:
     runs-on: windows-2022
     steps:
-      - name: Build Installer Quick Plugin
-        uses: ModOrganizer2/build-with-mob-action@master
+      # https://learn.microsoft.com/en-us/vcpkg/consume/binary-caching-github-actions-cache
+      - name: Export GitHub Actions cache environment variables
+        uses: actions/github-script@v7
+        with:
+          script: |
+            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
+            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
         with:
-          mo2-dependencies: cmake_common uibase
+          setup-python: false
+          version: 6.7.0
+          modules:
+          cache: true
+
+      - uses: actions/checkout@v4
+
+      - name: "Set environmental variables"
+        shell: bash
+        run: |
+          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
+
+      - name: Configure Installer Quick
+        shell: pwsh
+        run: |
+          cmake --preset vs2022-windows-standalone `
+            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
+            "-DCMAKE_INSTALL_PREFIX=install"
+
+      - name: Build Installer Quick
+        run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL

CMakeLists.txt

@@ -1,10 +1,4 @@
 cmake_minimum_required(VERSION 3.16)
 
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
-else()
-	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
-endif()
-
 project(installer_quick)
 add_subdirectory(src)

CMakePresets.json

@@ -0,0 +1,60 @@
+{
+  "configurePresets": [
+    {
+      "errors": {
+        "deprecated": true
+      },
+      "hidden": true,
+      "name": "cmake-dev",
+      "warnings": {
+        "deprecated": true,
+        "dev": true
+      }
+    },
+    {
+      "cacheVariables": {
+        "VCPKG_MANIFEST_NO_DEFAULT_FEATURES": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      },
+      "toolchainFile": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
+      "hidden": true,
+      "name": "vcpkg"
+    },
+    {
+      "hidden": true,
+      "inherits": ["vcpkg"],
+      "name": "vcpkg-dev"
+    },
+    {
+      "binaryDir": "${sourceDir}/vsbuild",
+      "architecture": {
+        "strategy": "set",
+        "value": "x64"
+      },
+      "cacheVariables": {
+        "CMAKE_CXX_FLAGS": "/EHsc /MP /W4",
+        "VCPKG_TARGET_TRIPLET": {
+          "type": "STRING",
+          "value": "x64-windows-static-md"
+        }
+      },
+      "generator": "Visual Studio 17 2022",
+      "inherits": ["cmake-dev", "vcpkg-dev"],
+      "name": "vs2022-windows",
+      "toolset": "v143"
+    },
+    {
+      "cacheVariables": {
+        "VCPKG_MANIFEST_FEATURES": {
+          "type": "STRING",
+          "value": "standalone"
+        }
+      },
+      "inherits": "vs2022-windows",
+      "name": "vs2022-windows-standalone"
+    }
+  ],
+  "version": 4
+}

src/CMakeLists.txt

@@ -1,5 +1,9 @@
 cmake_minimum_required(VERSION 3.16)
 
+find_package(mo2-cmake CONFIG REQUIRED)
+find_package(mo2-uibase CONFIG REQUIRED)
+
 add_library(installer_quick SHARED)
-mo2_configure_plugin(installer_quick WARNINGS OFF)
-mo2_install_target(installer_quick)
+mo2_configure_plugin(installer_quick WARNINGS 4)
+target_link_libraries(installer_quick PRIVATE mo2::uibase)
+mo2_install_plugin(installer_quick)

src/SConscript

@@ -1,12 +1,12 @@
 #include "installerquick.h"
 
-#include "igamefeatures.h"
-#include "iplugingame.h"
-#include "log.h"
-
 #include <QDialog>
 #include <QtPlugin>
 
+#include <uibase/game_features/igamefeatures.h>
+#include <uibase/iplugingame.h>
+#include <uibase/log.h>
+
 #include "simpleinstalldialog.h"
 
 using namespace MOBase;
@@ -65,7 +65,7 @@ bool InstallerQuick::isManualInstaller() const
 
 bool InstallerQuick::isDataTextArchiveTopLayer(std::shared_ptr<const IFileTree> tree,
                                                QString const& dataFolderName,
-                                               ModDataChecker* checker) const
+                                               ModDataChecker*) const
 {
   // A "DataText" archive is defined as having exactly one folder named like
   // `dataFolderName` and one or more "useless" files (text files, pdf, or images).

src/installerQuick.pro

@@ -1,15 +1,15 @@
 #ifndef INSTALLERQUICK_H
 #define INSTALLERQUICK_H
 
-#include <iplugininstallersimple.h>
-#include <moddatachecker.h>
+#include <uibase/game_features/moddatachecker.h>
+#include <uibase/iplugininstallersimple.h>
 
 class InstallerQuick : public MOBase::IPluginInstallerSimple
 {
   Q_OBJECT
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-  Q_PLUGIN_METADATA(IID "org.tannin.InstallerQuick" FILE "installerquick.json")
+  Q_PLUGIN_METADATA(IID "org.tannin.InstallerQuick")
 #endif
 
 public:

src/installerquick.cpp

@@ -16,9 +16,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 */
-
 #include "simpleinstalldialog.h"
 #include "ui_simpleinstalldialog.h"
+
 #include <QLineEdit>
 
 #include <QComboBox>