Update following dependency changes.

Author: Holt59

CMakeLists.txt

@@ -1,16 +1,10 @@
 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)
-
-if(DEFINED DEPENDENCIES_DIR)
-	include(${DEPENDENCIES_DIR}/modorganizer_super/cmake_common/mo2.cmake)
-else()
-	include(${CMAKE_CURRENT_LIST_DIR}/../cmake_common/mo2.cmake)
-endif()
+# remove MinSizeRel otherwise CMP0111 breaks everything
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo" CACHE STRING "" FORCE)
 
 project(organizer)
+
 add_subdirectory(src)
 
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/dump_running_process.bat DESTINATION bin)

CMakePresets.json

@@ -0,0 +1,52 @@
+{
+  "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"
+    }
+  ],
+  "buildPresets": [
+    {
+      "name": "vs2022-windows",
+      "resolvePackageReferences": "on",
+      "configurePreset": "vs2022-windows"
+    }
+  ],
+  "version": 4
+}

appveyor.yml

@@ -1,17 +1,32 @@
 cmake_minimum_required(VERSION 3.16)
 
+find_package(mo2-cmake CONFIG REQUIRED)
+
 find_package(usvfs CONFIG REQUIRED)
+
 find_package(mo2-uibase CONFIG REQUIRED)
+find_package(mo2-archive CONFIG REQUIRED)
+find_package(mo2-lootcli-header CONFIG REQUIRED)
+find_package(mo2-githubpp CONFIG REQUIRED)
+find_package(mo2-bsatk CONFIG REQUIRED)
+find_package(mo2-esptk CONFIG REQUIRED)
+find_package(mo2-dds-header CONFIG REQUIRED)
+
+find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets WebSockets)
+find_package(Boost CONFIG REQUIRED COMPONENTS program_options thread interprocess signals2 uuid accumulators)
+find_package(7zip CONFIG REQUIRED)
+find_package(lz4 CONFIG REQUIRED)
+find_package(ZLIB REQUIRED)
 
 add_executable(organizer)
 set_target_properties(organizer PROPERTIES OUTPUT_NAME "ModOrganizer")
-mo2_configure_executable(organizer
-	WARNINGS OFF
-	EXTRA_TRANSLATIONS ${MO2_SUPER_PATH}/game_gamebryo/src ${MO2_UIBASE_PATH}/src
-	PRIVATE_DEPENDS
-		githubpp bsatk esptk archive lootcli boost::program_options
-		Qt::WebEngineWidgets Qt::WebSockets)
-target_link_libraries(organizer PRIVATE Shlwapi usvfs::usvfs mo2::uibase)
+mo2_configure_executable(organizer WARNINGS OFF)
+target_link_libraries(organizer PRIVATE
+	Shlwapi Bcrypt
+	usvfs::usvfs mo2::uibase mo2::archive mo2::githubpp
+	mo2::bsatk mo2::esptk mo2::lootcli-header
+	Boost::program_options Boost::signals2 Boost::uuid Boost::accumulators
+	Qt6::WebEngineWidgets Qt6::WebSockets)
 mo2_install_target(organizer)
 
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/dlls.manifest.qt6"
@@ -31,7 +46,7 @@ install(DIRECTORY
 install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/resources/markdown.html"
 	DESTINATION bin/resources)
 
-mo2_deploy_qt(BINARIES ModOrganizer.exe uibase.dll plugins/bsa_packer.dll)
+mo2_deploy_qt(BINARIES ModOrganizer.exe uibase.dll)
 
 mo2_add_filter(NAME src/application GROUPS
 	iuserinterface

src/CMakeLists.txt

@@ -20,8 +20,8 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef ARCHIVEFILENETRY_H
 #define ARCHIVEFILENTRY_H
 
-#include "archive.h"
-#include "ifiletree.h"
+#include <archive/archive.h>
+#include <uibase/ifiletree.h>
 
 /**
  *

src/archivefiletree.h

@@ -20,17 +20,17 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef INSTALLATIONMANAGER_H
 #define INSTALLATIONMANAGER_H
 
-#include <guessedvalue.h>
-#include <ifiletree.h>
-#include <iinstallationmanager.h>
-#include <iplugininstaller.h>
+#include <archive/archive.h>
+#include <uibase/errorcodes.h>
+#include <uibase/guessedvalue.h>
+#include <uibase/ifiletree.h>
+#include <uibase/iinstallationmanager.h>
+#include <uibase/iplugininstaller.h>
 
 #include <QObject>
 #define WIN32_LEAN_AND_MEAN
 #include <QProgressDialog>
 #include <Windows.h>
-#include <archive.h>
-#include <errorcodes.h>
 #include <map>
 #include <set>
 

src/installationmanager.h

@@ -20,19 +20,20 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef MAINWINDOW_H
 #define MAINWINDOW_H
 
-#include "bsafolder.h"
+#include <bsatk/bsafolder.h>
+#include <uibase/log.h>
+#include <uibase/tutorialcontrol.h>
+#include <uibase/errorcodes.h>
+#include <uibase/imoinfo.h>
+#include <uibase/iplugingame.h>
+
 #include "delayedfilewriter.h"
-#include "errorcodes.h"
-#include "imoinfo.h"
-#include "iplugingame.h"  //namespace MOBase { class IPluginGame; }
 #include "iuserinterface.h"
 #include "modinfo.h"
 #include "modlistbypriorityproxy.h"
 #include "modlistsortproxy.h"
-#include "plugincontainer.h"  //class PluginContainer;
+#include "plugincontainer.h"
 #include "shared/fileregisterfwd.h"
-#include "tutorialcontrol.h"
-#include <log.h>
 
 class Executable;
 class CategoryFactory;