Skip to content

Commit bf68399

Browse files
committed
Update for libbsarch.
1 parent c1f3e44 commit bf68399

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
cmake_minimum_required(VERSION 3.16)
22

3-
# remove MinSizeRel otherwise CMP0111 breaks everything
4-
set(CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo" CACHE STRING "" FORCE)
5-
63
project(organizer)
74

85
add_subdirectory(src)

src/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ find_package(mo2-githubpp CONFIG REQUIRED)
1111
find_package(mo2-bsatk CONFIG REQUIRED)
1212
find_package(mo2-esptk CONFIG REQUIRED)
1313
find_package(mo2-dds-header CONFIG REQUIRED)
14+
find_package(mo2-libbsarch CONFIG REQUIRED)
1415

1516
find_package(Qt6 REQUIRED COMPONENTS WebEngineWidgets WebSockets)
1617
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")
2324
mo2_configure_executable(organizer WARNINGS OFF)
2425
target_link_libraries(organizer PRIVATE
2526
Shlwapi Bcrypt
26-
usvfs::usvfs mo2::uibase mo2::archive mo2::githubpp
27+
usvfs::usvfs mo2::uibase mo2::archive mo2::githubpp mo2::libbsarch
2728
mo2::bsatk mo2::esptk mo2::lootcli-header
2829
Boost::program_options Boost::signals2 Boost::uuid Boost::accumulators
2930
Qt6::WebEngineWidgets Qt6::WebSockets)

src/organizercore.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
#include <tuple>
7272
#include <utility>
7373

74-
#include "bs_archive.h"
74+
#include <libbsarch/bs_archive.h>
7575

7676
#include "organizerproxy.h"
7777

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"kind": "git",
1616
"repository": "https://github.com/ModOrganizer2/vcpkg-registry",
1717
"baseline": "a07812dd075d7ce5586e5cc9052050f229e6ecb0",
18-
"packages": ["mo2-cmake", "mo2-dds-header"]
18+
"packages": ["mo2-*"]
1919
}
2020
]
2121
}

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"dependencies": [
33
"mo2-cmake",
4-
"mo2-dds-header",
4+
"mo2-libbsarch",
55
"boost-accumulators",
66
"boost-assign",
77
"boost-date-time",

0 commit comments

Comments
 (0)