noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename Settings to PajladaSettings

Browse source
This commit is contained in:
Rasmus Karlsson 2021-02-20 15:51:52 +01:00
parent 5cf9decc57
commit a592784dd4
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -90,7 +90,7 @@ else (USE_PACKAGE_MANAGER)
find_package(PajladaSerialize REQUIRED) find_package(PajladaSerialize REQUIRED)
find_package(PajladaSignals REQUIRED) find_package(PajladaSignals REQUIRED)
find_package(Settings REQUIRED) find_package(PajladaSettings REQUIRED)
if (BUILD_APP) if (BUILD_APP)
find_package(LibCommuni REQUIRED) find_package(LibCommuni REQUIRED)

18
cmake/FindPajladaSettings.cmake
View file

@ -1,16 +1,16 @@
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_path(Settings_INCLUDE_DIR pajlada/settings.hpp) find_path(PajladaSettings_INCLUDE_DIR pajlada/settings.hpp)
find_library(Settings_LIBRARY PajladaSettings) find_library(PajladaSettings_LIBRARY PajladaSettings)
find_package_handle_standard_args(Settings DEFAULT_MSG Settings_INCLUDE_DIR Settings_LIBRARY) find_package_handle_standard_args(PajladaSettings DEFAULT_MSG PajladaSettings_INCLUDE_DIR PajladaSettings_LIBRARY)
if (Settings_FOUND) if (PajladaSettings_FOUND)
add_library(Settings::Settings INTERFACE IMPORTED) add_library(Pajlada::Settings INTERFACE IMPORTED)
set_target_properties(Settings::Settings PROPERTIES set_target_properties(Pajlada::Settings PROPERTIES
INTERFACE_INCLUDE_DIRECTORIES "${Settings_INCLUDE_DIR}" INTERFACE_INCLUDE_DIRECTORIES "${PajladaSettings_INCLUDE_DIR}"
INTERFACE_LINK_LIBRARIES "${Settings_LIBRARY}" INTERFACE_LINK_LIBRARIES "${PajladaSettings_LIBRARY}"
) )
endif () endif ()
mark_as_advanced(Settings_INCLUDE_DIR Settings_LIBRARY) mark_as_advanced(PajladaSettings_INCLUDE_DIR PajladaSettings_LIBRARY)

2
src/CMakeLists.txt
View file

@ -280,7 +280,7 @@ else ()
OpenSSL::OpenSSL OpenSSL::OpenSSL
qt5keychain qt5keychain
Pajlada::Serialize Pajlada::Serialize
Settings::Settings Pajlada::Settings
Pajlada::Signals Pajlada::Signals
websocketpp::websocketpp websocketpp::websocketpp
) )