Merge vcpkg-configuration.json into vcpkg.json and add standalone build.

Author: Holt59

.github/workflows/build-and-test.yml

@@ -34,28 +34,17 @@ jobs:
           cache: true
 
       - uses: actions/checkout@v4
-      - uses: lukka/run-vcpkg@v11
 
-      # build uibase
-      - uses: actions/checkout@v4
-        with:
-          repository: ModOrganizer2/modorganizer-uibase
-          ref: dev/vcpkg
-          path: uibase
-
-      - name: Build UIBase
+      - name: "Set environmental variables"
+        shell: bash
         run: |
-          cmake --preset vs2022-windows `
-            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
-            "-DCMAKE_INSTALL_PREFIX=install"
-          cmake --build vsbuild --config RelWithDebInfo --target INSTALL
-        working-directory: uibase
+          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
 
       - name: Configure Plugin Python build
         shell: pwsh
         run: |
-          cmake --preset vs2022-windows `
-            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64;${{ github.workspace }}\uibase\install\lib\cmake" `
+          cmake --preset vs2022-windows-standalone `
+            "-DCMAKE_PREFIX_PATH=${env:QT_ROOT_DIR}\msvc2019_64" `
             -DPLUGIN_PYTHON_TESTING=ON
 
       - name: Build Plugin Python

CMakeLists.txt

@@ -4,11 +4,13 @@ cmake_policy(SET CMP0144 NEW)
 
 project(plugin_python CXX)
 
-find_package(mo2-cmake CONFIG REQUIRED)
-
+# find Python before include mo2-cmake, otherwise this will trigger a bunch of CMP0111
+# due to the imported configuration mapping variables defined in mo2.cmake
 find_package(Python ${MO2_PYTHON_VERSION} COMPONENTS Interpreter Development REQUIRED)
 find_package(pybind11 CONFIG REQUIRED)
 
+find_package(mo2-cmake CONFIG REQUIRED)
+
 get_filename_component(Python_HOME ${Python_EXECUTABLE} PATH)
 set(Python_DLL_DIR "${Python_HOME}/DLLs")
 set(Python_LIB_DIR "${Python_HOME}/Lib")

CMakePresets.json

@@ -50,6 +50,16 @@
       "inherits": ["cmake-dev", "vcpkg-dev"],
       "name": "vs2022-windows",
       "toolset": "v143"
+    },
+    {
+      "cacheVariables": {
+        "VCPKG_MANIFEST_FEATURES": {
+          "type": "STRING",
+          "value": "standalone;testing"
+        }
+      },
+      "inherits": "vs2022-windows",
+      "name": "vs2022-windows-standalone"
     }
   ],
   "buildPresets": [

vcpkg-configuration.json

@@ -4,6 +4,31 @@
     "testing": {
       "description": "Build Plugin Python tests.",
       "dependencies": ["gtest"]
+    },
+    "standalone": {
+      "description": "Build Standalone.",
+      "dependencies": ["mo2-uibase"]
     }
+  },
+  "vcpkg-configuration": {
+    "default-registry": {
+      "kind": "git",
+      "repository": "https://github.com/Microsoft/vcpkg",
+      "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7"
+    },
+    "registries": [
+      {
+        "kind": "git",
+        "repository": "https://github.com/Microsoft/vcpkg",
+        "baseline": "f61a294e765b257926ae9e9d85f96468a0af74e7",
+        "packages": ["boost*", "boost-*"]
+      },
+      {
+        "kind": "git",
+        "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
+        "baseline": "70c0aacd6962073dae6e46c2e810c91aa755d2e2",
+        "packages": ["mo2-*", "pybind11", "spdlog"]
+      }
+    ]
   }
 }