Move to VCPKG.

.github/workflows/build.yml

@@ -1,16 +1,47 @@
-name: Build Installer FOMOD Plugin
+name: Build Installer FOMOD
 
 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 FOMOD 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 FOMOD
+        shell: pwsh
+        run: |
+          cmake --preset vs2022-windows-standalone `
+            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
+            "-DCMAKE_INSTALL_PREFIX=install"
+
+      - name: Build Installer FOMOD
+        run: cmake --build vsbuild --config RelWithDebInfo --target INSTALL

CMakeLists.txt

@@ -2,10 +2,4 @@ cmake_minimum_required(VERSION 3.16)
 
 project(installer_fomod)
 
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
-else()
-	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
-endif()
-
 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_fomod SHARED)
 mo2_configure_plugin(installer_fomod WARNINGS OFF)
-mo2_install_target(installer_fomod)
+target_link_libraries(installer_fomod PRIVATE mo2::uibase)
+mo2_install_plugin(installer_fomod)

src/fomodinstallerdialog.cpp

@@ -20,16 +20,10 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "fomodinstallerdialog.h"
 #include "ui_fomodinstallerdialog.h"
 
-#include "fomodscreenshotdialog.h"
-#include "igamefeatures.h"
-#include "imoinfo.h"
-#include "iplugingame.h"
-#include "log.h"
-#include "report.h"
-#include "scopeguard.h"
-#include "scriptextender.h"
-#include "utility.h"
-#include "xmlreader.h"
+#include <array>
+#include <sstream>
+#include <utility>
+#include <vector>
 
 #include <QCheckBox>
 #include <QCompleter>
@@ -43,10 +37,17 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <Shellapi.h>
 
-#include <array>
-#include <sstream>
-#include <utility>
-#include <vector>
+#include <uibase/game_features/igamefeatures.h>
+#include <uibase/game_features/scriptextender.h>
+#include <uibase/imoinfo.h>
+#include <uibase/iplugingame.h>
+#include <uibase/log.h>
+#include <uibase/report.h>
+#include <uibase/scopeguard.h>
+#include <uibase/utility.h>
+
+#include "fomodscreenshotdialog.h"
+#include "xmlreader.h"
 
 using namespace MOBase;
 

src/fomodinstallerdialog.h

@@ -19,12 +19,6 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include "guessedvalue.h"
-#include "ifiletree.h"
-#include "imoinfo.h"
-#include "iplugininstaller.h"
-#include "ipluginlist.h"
-
 #include <QDialog>
 #include <QGroupBox>
 #include <QMetaType>
@@ -34,6 +28,12 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <functional>
 #include <vector>
 
+#include <uibase/guessedvalue.h>
+#include <uibase/ifiletree.h>
+#include <uibase/imoinfo.h>
+#include <uibase/iplugininstaller.h>
+#include <uibase/ipluginlist.h>
+
 #include "installerfomod.h"
 
 class QAbstractButton;

src/fomodscreenshotdialog.cpp

@@ -16,12 +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 "fomodscreenshotdialog.h"
 #include "ui_fomodscreenshotdialog.h"
 
-#include "scalelabel.h"
-
 #include <QDirIterator>
 #include <QFrame>
 #include <QProxyStyle>
@@ -30,6 +27,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QTableWidget>
 #include <QWindow>
 
+#include "scalelabel.h"
+
 constexpr int kScreenshotTileWidth   = 100;
 constexpr int kScreenshotTileHeight  = 80;
 constexpr int kScreenshotTileSpacing = 16;

src/installerfomod.cpp

@@ -1,18 +1,18 @@
 #include "installerfomod.h"
 
-#include "fomodinstallerdialog.h"
-#include "imodinterface.h"
-#include "imodlist.h"
-
-#include <iinstallationmanager.h>
-#include <log.h>
-#include <report.h>
-#include <utility.h>
-
 #include <QImageReader>
 #include <QStringList>
 #include <QtPlugin>
 
+#include <uibase/iinstallationmanager.h>
+#include <uibase/imodinterface.h>
+#include <uibase/imodlist.h>
+#include <uibase/log.h>
+#include <uibase/report.h>
+#include <uibase/utility.h>
+
+#include "fomodinstallerdialog.h"
+
 using namespace MOBase;
 
 InstallerFomod::InstallerFomod() : m_MOInfo(nullptr) {}

src/installerfomod.h

@@ -1,9 +1,9 @@
 #ifndef INSTALLERFOMOD_H
 #define INSTALLERFOMOD_H
 
-#include <iplugindiagnose.h>
-#include <iplugininstallersimple.h>
-#include <ipluginlist.h>
+#include <uibase/iplugindiagnose.h>
+#include <uibase/iplugininstallersimple.h>
+#include <uibase/ipluginlist.h>
 
 class InstallerFomod : public MOBase::IPluginInstallerSimple,
                        public MOBase::IPluginDiagnose
@@ -13,7 +13,7 @@ class InstallerFomod : public MOBase::IPluginInstallerSimple,
   Q_INTERFACES(MOBase::IPlugin MOBase::IPluginInstaller MOBase::IPluginInstallerSimple
                    MOBase::IPluginDiagnose)
 #if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
-  Q_PLUGIN_METADATA(IID "org.tannin.InstallerFomod" FILE "installerfomod.json")
+  Q_PLUGIN_METADATA(IID "org.tannin.InstallerFomod")
 #endif
 
 public:

src/scalelabel.cpp

@@ -1,4 +1,5 @@
 #include "scalelabel.h"
+
 #include <QResizeEvent>
 
 static bool isResourceMovie(const QString& path)

src/xmlreader.cpp

@@ -1,8 +1,9 @@
 #include "xmlreader.h"
 
-#include "utility.h"
 #include <QDebug>
 
+#include <uibase/utility.h>
+
 using MOBase::Exception;
 
 bool XmlReader::getNextElement(QString const& start)

vcpkg.json

@@ -0,0 +1,16 @@
+{
+  "dependencies": ["mo2-cmake"],
+  "features": {
+    "standalone": {
+      "description": "Build Standalone.",
+      "dependencies": ["mo2-uibase"]
+    }
+  },
+  "vcpkg-configuration": {
+    "default-registry": {
+      "kind": "git",
+      "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
+      "baseline": "d194ec4e14052784518d5e9f1c5ccac16de49c2c"
+    }
+  }
+}