chore: update pajlada-signals, pajlada-serialize, pajlada-settings (#6797)
This commit is contained in:
@@ -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
|
||||
|
||||
|
||||
@@ -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)
|
||||
|
||||
+1
-1
Submodule lib/serialize updated: e5da9e9af6...75bc7b9c10
+1
-1
Submodule lib/settings updated: d847148cbf...16b3d5ba6e
+1
-1
Submodule lib/signals updated: 4b127541d3...ef0bd99788
+6
-6
@@ -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}
|
||||
|
||||
@@ -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());
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user