mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
deps: use upstream qtkeychain (#5697)
This commit is contained in:
parent
46c1f18ae7
commit
f3a5f81fa0
1
.gitmodules
vendored
1
.gitmodules
vendored
|
@ -20,7 +20,6 @@
|
|||
[submodule "lib/qtkeychain"]
|
||||
path = lib/qtkeychain
|
||||
url = https://github.com/Chatterino/qtkeychain
|
||||
branch = chatterino-cmake
|
||||
[submodule "lib/websocketpp"]
|
||||
path = lib/websocketpp
|
||||
url = https://github.com/zaphoyd/websocketpp
|
||||
|
|
|
@ -120,7 +120,7 @@
|
|||
- Dev: Emojis now use flags instead of a set of strings for capabilities. (#5616)
|
||||
- Dev: Move plugins to Sol2. (#5622, #5682)
|
||||
- Dev: Clarified our Lua dependency's version. (#5693)
|
||||
- Dev: Specified qtkeychain dependency version. (#5695)
|
||||
- Dev: Specified qtkeychain dependency version. (#5695, #5697)
|
||||
- Dev: Refactored static `MessageBuilder` helpers to standalone functions. (#5652)
|
||||
- Dev: Decoupled reply parsing from `MessageBuilder`. (#5660, #5668)
|
||||
- Dev: Refactored IRC message building. (#5663)
|
||||
|
|
|
@ -160,10 +160,19 @@ if (BUILD_WITH_QTKEYCHAIN)
|
|||
message(FATAL_ERROR "Submodules probably not loaded, unable to find lib/qtkeychain/CMakeLists.txt")
|
||||
endif()
|
||||
|
||||
set(_prev_testing ${BUILD_TESTING})
|
||||
set(BUILD_TESTING Off)
|
||||
add_subdirectory("${QTKEYCHAIN_ROOT_LIB_FOLDER}" EXCLUDE_FROM_ALL)
|
||||
set(BUILD_TESTING ${_prev_testing})
|
||||
|
||||
if (NOT TARGET qt${MAJOR_QT_VERSION}keychain)
|
||||
message(FATAL_ERROR "qt${MAJOR_QT_VERSION}keychain target was not created :@")
|
||||
endif()
|
||||
if (MSVC AND "${MAJOR_QT_VERSION}" STREQUAL "5")
|
||||
target_compile_definitions(qt5keychain PRIVATE UNICODE)
|
||||
target_compile_options(qt5keychain PRIVATE /utf-8)
|
||||
set_target_properties(qt5keychain PROPERTIES CXX_STANDARD 17)
|
||||
endif()
|
||||
endif()
|
||||
endif()
|
||||
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6
|
||||
Subproject commit 73c3772d6432280df83e1ab3299c2a8f1e4ea47f
|
|
@ -24,7 +24,7 @@
|
|||
# include "qt5keychain/keychain.h"
|
||||
# endif
|
||||
# else
|
||||
# include "keychain.h"
|
||||
# include <qtkeychain/keychain.h>
|
||||
# endif
|
||||
#endif
|
||||
|
||||
|
|
Loading…
Reference in a new issue