Move to VCPKG.

Author: Holt59

.github/workflows/build.yml

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

CMakeLists.txt

@@ -2,10 +2,4 @@ cmake_minimum_required(VERSION 3.16)
 
 project(installer_manual)
 
-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_manual SHARED)
-mo2_configure_plugin(installer_manual WARNINGS OFF)
-mo2_install_target(installer_manual)
+mo2_configure_plugin(installer_manual WARNINGS 4)
+target_link_libraries(installer_manual PRIVATE mo2::uibase)
+mo2_install_plugin(installer_manual)

src/SConscript

@@ -23,9 +23,9 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include <QDragMoveEvent>
 #include <QMessageBox>
 
-#include <ifiletree.h>
-#include <log.h>
-#include <report.h>
+#include <uibase/ifiletree.h>
+#include <uibase/log.h>
+#include <uibase/report.h>
 
 using namespace MOBase;
 
@@ -352,8 +352,9 @@ void ArchiveTreeWidget::dragEnterEvent(QDragEnterEvent* event)
 
 void ArchiveTreeWidget::dragMoveEvent(QDragMoveEvent* event)
 {
-  if (!testMovePossible(static_cast<ArchiveTreeWidgetItem*>(currentItem()),
-                        static_cast<ArchiveTreeWidgetItem*>(itemAt(event->pos())))) {
+  if (!testMovePossible(
+          static_cast<ArchiveTreeWidgetItem*>(currentItem()),
+          static_cast<ArchiveTreeWidgetItem*>(itemAt(event->position().toPoint())))) {
     event->ignore();
   } else {
     QTreeWidget::dragMoveEvent(event);
@@ -402,7 +403,8 @@ void ArchiveTreeWidget::dropEvent(QDropEvent* event)
   event->ignore();
 
   // target widget (should be a directory)
-  auto* target = static_cast<ArchiveTreeWidgetItem*>(itemAt(event->pos()));
+  auto* target =
+      static_cast<ArchiveTreeWidgetItem*>(itemAt(event->position().toPoint()));
 
   // this should not really happen because it is prevent by dragMoveEvent
   if (target->flags().testFlag(Qt::ItemNeverHasChildren)) {

src/archivetree.cpp

@@ -22,7 +22,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <QTreeWidget>
 
-#include "ifiletree.h"
+#include <uibase/ifiletree.h>
 
 class ArchiveTreeWidget;
 

src/archivetree.h

@@ -20,16 +20,16 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #include "installdialog.h"
 #include "ui_installdialog.h"
 
-#include "log.h"
-#include "report.h"
-#include "utility.h"
-
 #include <QCompleter>
 #include <QInputDialog>
 #include <QMenu>
 #include <QMessageBox>
 #include <QMetaType>
 
+#include <uibase/log.h>
+#include <uibase/report.h>
+#include <uibase/utility.h>
+
 using namespace MOBase;
 
 InstallDialog::InstallDialog(

src/installdialog.cpp

@@ -20,21 +20,22 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef INSTALLDIALOG_H
 #define INSTALLDIALOG_H
 
-#include "archivetree.h"
-#include "tutorabledialog.h"
-#include <guessedvalue.h>
-#include <ifiletree.h>
-
-#include <iplugingame.h>
-#include <moddatachecker.h>
-
 #include <QDialog>
 #include <QProgressDialog>
 #include <QTreeWidgetItem>
 #include <QUuid>
+
+#include <uibase/game_features/moddatachecker.h>
+#include <uibase/guessedvalue.h>
+#include <uibase/ifiletree.h>
+#include <uibase/iplugingame.h>
+#include <uibase/tutorabledialog.h>
+
 #define WIN32_LEAN_AND_MEAN
 #include <Windows.h>
 
+#include "archivetree.h"
+
 namespace Ui
 {
 class InstallDialog;

src/installdialog.h

@@ -19,17 +19,17 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "installermanual.h"
 
-#include <igamefeatures.h>
-#include <iinstallationmanager.h>
-#include <iplugingame.h>
-#include <moddatachecker.h>
-#include <utility.h>
-
 #include <QDialog>
 #include <QtPlugin>
 
 #include <Shellapi.h>
 
+#include <uibase/game_features/igamefeatures.h>
+#include <uibase/game_features/moddatachecker.h>
+#include <uibase/iinstallationmanager.h>
+#include <uibase/iplugingame.h>
+#include <uibase/utility.h>
+
 #include "installdialog.h"
 
 using namespace MOBase;

src/installerManual.pro

@@ -20,15 +20,15 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef INSTALLERMANUAL_H
 #define INSTALLERMANUAL_H
 
-#include <imoinfo.h>
-#include <iplugininstallersimple.h>
+#include <uibase/imoinfo.h>
+#include <uibase/iplugininstallersimple.h>
 
 class InstallerManual : 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.InstallerManual" FILE "installermanual.json")
+  Q_PLUGIN_METADATA(IID "org.tannin.InstallerManual")
 #endif
 
 public:

src/installermanual.cpp

@@ -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"
+    }
+  }
+}