From f7aa5959c1f6548e45e9f6c99152a702b7580162 Mon Sep 17 00:00:00 2001 From: pajlada Date: Sat, 7 Feb 2026 14:26:58 +0100 Subject: [PATCH] chore: update pajlada-signals, pajlada-serialize, pajlada-settings (#6797) --- CHANGELOG.md | 3 +++ CMakeLists.txt | 3 +++ lib/serialize | 2 +- lib/settings | 2 +- lib/signals | 2 +- src/CMakeLists.txt | 12 ++++++------ src/providers/twitch/TwitchAccountManager.cpp | 2 +- 7 files changed, 16 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ecfc3011..cc82868d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -106,6 +106,9 @@ - Dev: Refactored `DebugCount`. (#6753) - Dev: Moved `PluginMeta` to its own file. (#6757) - Dev: Moves some `Channel` signals to `TwitchChannel`. (#6787) +- Dev: Updated `pajlada-settings` to v0.5.0. (#6797) +- Dev: Updated `pajlada-serialize` to v0.2.1. (#6797) +- Dev: Updated `pajlada-signals` to v0.1.1. (#6797) ## 2.5.4 diff --git a/CMakeLists.txt b/CMakeLists.txt index 13698e33..0e58ef7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -241,16 +241,19 @@ FetchContent_Declare( PajladaSignals SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/signals EXCLUDE_FROM_ALL + FIND_PACKAGE_ARGS CONFIG ) FetchContent_Declare( PajladaSerialize SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/serialize EXCLUDE_FROM_ALL + FIND_PACKAGE_ARGS CONFIG ) FetchContent_Declare( PajladaSettings SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/lib/settings EXCLUDE_FROM_ALL + FIND_PACKAGE_ARGS CONFIG ) FetchContent_MakeAvailable(RapidJSON PajladaSignals PajladaSerialize PajladaSettings) diff --git a/lib/serialize b/lib/serialize index e5da9e9a..75bc7b9c 160000 --- a/lib/serialize +++ b/lib/serialize @@ -1 +1 @@ -Subproject commit e5da9e9af67b3c22a800330842d1df96cadf6adc +Subproject commit 75bc7b9c1054f70d0dd0486f175dea93c7733cc3 diff --git a/lib/settings b/lib/settings index d847148c..16b3d5ba 160000 --- a/lib/settings +++ b/lib/settings @@ -1 +1 @@ -Subproject commit d847148cbf0becb75e48b90c2c25b78922f4e181 +Subproject commit 16b3d5ba6e947e84df74e17a19121d6be8baf36b diff --git a/lib/signals b/lib/signals index 4b127541..ef0bd997 160000 --- a/lib/signals +++ b/lib/signals @@ -1 +1 @@ -Subproject commit 4b127541d30d9ae86df1553cb567cc2fc55fac46 +Subproject commit ef0bd9978826bfb2df536c1312762bacbe0b45fa diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4f926aa1..d4d9aa12 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -912,14 +912,14 @@ if (CHATTERINO_GENERATE_COVERAGE) endif () if(TARGET rapidjson) - message(DEBUG "Linking to rapidjson target") + message(STATUS "rapidjson: Linking to rapidjson target") target_link_libraries(${LIBRARY_PROJECT} PUBLIC rapidjson) -elseif(DEFINED RapidJSON_SOURCE_DIR) - message(DEBUG "RapidJSON_SOURCE_DIR defined, assuming this is a submodule/source build. (${RapidJSON_SOURCE_DIR})") - target_include_directories(${LIBRARY_PROJECT} SYSTEM PUBLIC ${RapidJSON_SOURCE_DIR}/include) -else() - message(DEBUG "No rapidjson target found, this is most likely a system install. Adding include directories (${RAPIDJSON_INCLUDE_DIRS}) instead") +elseif(DEFINED RAPIDJSON_INCLUDE_DIRS) + message(STATUS "rapidjson: RAPIDJSON_INCLUDE_DIRS defined (${RAPIDJSON_INCLUDE_DIRS}). Most likely a system install.") target_include_directories(${LIBRARY_PROJECT} SYSTEM PUBLIC ${RAPIDJSON_INCLUDE_DIRS}) +elseif(DEFINED RapidJSON_SOURCE_DIR) + message(STATUS "rapidjson: RapidJSON_SOURCE_DIR defined, assuming this is a submodule/source build. (${RapidJSON_SOURCE_DIR})") + target_include_directories(${LIBRARY_PROJECT} SYSTEM PUBLIC ${RapidJSON_SOURCE_DIR}/include) endif() target_link_libraries(${LIBRARY_PROJECT} diff --git a/src/providers/twitch/TwitchAccountManager.cpp b/src/providers/twitch/TwitchAccountManager.cpp index 177cabd4..941ae3ce 100644 --- a/src/providers/twitch/TwitchAccountManager.cpp +++ b/src/providers/twitch/TwitchAccountManager.cpp @@ -413,7 +413,7 @@ bool TwitchAccountManager::removeUser(TwitchAccount *account) auto userID(account->getUserId()); if (!userID.isEmpty()) { - pajlada::Settings::SettingManager::removeSetting( + pajlada::Settings::SettingManager::gRemoveSetting( accountFormat.arg(userID).toStdString()); }