Update for libbsarch.

ModOrganizer2 · Jul 11, 2024 · bf68399 · bf68399
1 parent c1f3e44
commit bf68399
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
 
-# remove MinSizeRel otherwise CMP0111 breaks everything
-set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo" CACHE STRING "" FORCE)
-
 project(organizer)
 
 add_subdirectory(src)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -11,6 +11,7 @@ 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(mo2-libbsarch CONFIG REQUIRED)
 
 find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets WebSockets)
 find_package(Boost CONFIG REQUIRED COMPONENTS program_options thread interprocess signals2 uuid accumulators)
@@ -23,7 +24,7 @@ set_target_properties(organizer PROPERTIES OUTPUT_NAME "ModOrganizer")
 mo2_configure_executable(organizer WARNINGS OFF)
 target_link_libraries(organizer PRIVATE
 	Shlwapi Bcrypt
-	usvfs::usvfs mo2::uibase mo2::archive mo2::githubpp
+	usvfs::usvfs mo2::uibase mo2::archive mo2::githubpp mo2::libbsarch
 	mo2::bsatk mo2::esptk mo2::lootcli-header
 	Boost::program_options Boost::signals2 Boost::uuid Boost::accumulators
 	Qt6::WebEngineWidgets Qt6::WebSockets)

diff --git a/src/organizercore.cpp b/src/organizercore.cpp
@@ -71,7 +71,7 @@
 #include <tuple>
 #include <utility>
 
-#include "bs_archive.h"
+#include <libbsarch/bs_archive.h>
 
 #include "organizerproxy.h"
 

diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -15,7 +15,7 @@
       "kind": "git",
       "repository": "https://github.com/ModOrganizer2/vcpkg-registry",
       "baseline": "a07812dd075d7ce5586e5cc9052050f229e6ecb0",
-      "packages": ["mo2-cmake", "mo2-dds-header"]
+      "packages": ["mo2-*"]
     }
   ]
 }
diff --git a/vcpkg.json b/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "dependencies": [
     "mo2-cmake",
-    "mo2-dds-header",
+    "mo2-libbsarch",
     "boost-accumulators",
     "boost-assign",
     "boost-date-time",