Move to VCPKG

.github/ISSUE_TEMPLATE/game-support-request.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.** 
+**This template is useful to add basic support using https://github.com/ModOrganizer2/modorganizer-basic_games.**
 
 **If you are vaguely familiar with programming you can try following the instructions on that link to get something working yourself. If you have trouble with that please fill in this template.**
 

.github/workflows/build.yml

@@ -2,35 +2,28 @@ name: Build ModOrganizer 2
 
 on:
   push:
-    branches: master
+    branches: [master]
   pull_request:
     types: [opened, synchronize, reopened]
 
-env:
-  VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
-
 jobs:
   build:
     runs-on: windows-2022
     steps:
-      # 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
+      - name: Build ModOrganizer
+        id: build-modorganizer
+        uses: ModOrganizer2/build-with-mob-action@dev/vcpkg
         with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          mo2-dependencies: usvfs uibase bsatk esptk archive lootcli
 
-      - name: "Set environmental variables"
-        shell: bash
+      - name: Install ModOrganizer
+        shell: pwsh
         run: |
-          echo "VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT" >> $GITHUB_ENV
+          cmake --install vsbuild --config RelWithDebInfo -j4
+        working-directory: ./build/${{ github.event.repository.name }}
 
-      - name: Build ModOrganizer 2
-        uses: ModOrganizer2/build-with-mob-action@master
+      - name: Package ModOrganizer
+        uses: actions/upload-artifact@master
         with:
-          qt-modules: qtpositioning qtwebchannel qtwebengine qtwebsockets
-          mo2-third-parties:
-            7z zlib gtest libbsarch libloot openssl bzip2 python lz4 spdlog
-            boost boost-di sip pyqt pybind11 ss licenses explorerpp DirectXTex
-          mo2-dependencies: usvfs cmake_common uibase githubpp bsatk esptk archive lootcli game_gamebryo
+          name: modorganizer
+          path: ./install/bin

.pre-commit-config.yaml

@@ -0,0 +1,20 @@
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-merge-conflict
+      - id: check-case-conflict
+  - repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: v19.1.5
+    hooks:
+    - id: clang-format
+      'types_or': [c++, c]
+
+ci:
+  autofix_commit_msg: "[pre-commit.ci] Auto fixes from pre-commit.com hooks."
+  autofix_prs: true
+  autoupdate_commit_msg: "[pre-commit.ci] Pre-commit autoupdate."
+  autoupdate_schedule: quarterly
+  submodules: false

CMakeLists.txt

@@ -1,16 +1,21 @@
 cmake_minimum_required(VERSION 3.16)
 
-# TODO: move these to cmake_common?
-set(OPENSSL_USE_STATIC_LIBS FALSE CACHE STRING "" FORCE)
-set(MySQL_INCLUDE_DIRS CACHE STRING "" FORCE)
+# TODO: clean include directives
+set(MO2_CMAKE_DEPRECATED_UIBASE_INCLUDE ON)
 
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
+project(organizer)
+
+# if MO2_INSTALL_IS_BIN is set, this means that we should install directly into the
+# installation prefix, without the bin/ subfolder, typically for a standalone build
+# to update an existing install
+if (MO2_INSTALL_IS_BIN)
+	set(_bin ".")
 else()
-	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
+	set(_bin bin)
 endif()
 
-project(organizer)
 add_subdirectory(src)
 
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION bin)
+set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT organizer)
+
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION ${_bin})

CMakePresets.json

@@ -0,0 +1,59 @@
+{
+  "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"
+    },
+    {
+      "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"],
+      "name": "vs2022-windows",
+      "toolset": "v143"
+    },
+    {
+      "cacheVariables": {
+        "VCPKG_MANIFEST_FEATURES": {
+          "type": "STRING",
+          "value": "standalone"
+        },
+        "MO2_INSTALL_IS_BIN": {
+          "type": "BOOL",
+          "value": "ON"
+        }
+      },
+      "inherits": "vs2022-windows",
+      "name": "vs2022-windows-standalone"
+    }
+  ],
+  "version": 4
+}

LICENSE

@@ -671,4 +671,4 @@ into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.