Update qtkeychain to e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6 (#4250)
* Update qtkeychain to `e5b070831cf1ea3cb98c95f97fcb7439f8d79bd6` * FreeBSD/Cirrus - use system qtkeychain - this ensures we don't have to install pkg-config to get libsecret built * Set BUILD_SHARED_LIBS to OFF globally - this resolves the libcommuni build issue
This commit is contained in:
+1
-1
@@ -9,5 +9,5 @@ task:
|
||||
git submodule update
|
||||
mkdir build
|
||||
cd build
|
||||
cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DCMAKE_BUILD_TYPE="release" ..
|
||||
cmake CMAKE_C_COMPILER="cc" -DCMAKE_CXX_COMPILER="c++" -DCMAKE_C_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DCMAKE_CXX_FLAGS="-O2 -pipe -fstack-protector-strong -fno-strict-aliasing " -DLINK_OPTIONS="-fstack-protector-strong" -DCMAKE_INSTALL_PREFIX="/usr/local" -DUSE_SYSTEM_QTKEYCHAIN="ON" -DCMAKE_BUILD_TYPE="release" ..
|
||||
make -j $(getconf _NPROCESSORS_ONLN)
|
||||
|
||||
+1
-1
@@ -19,6 +19,7 @@ option(BUILD_WITH_QTKEYCHAIN "Build Chatterino with support for your system key
|
||||
option(USE_PRECOMPILED_HEADERS "Use precompiled headers" ON)
|
||||
option(BUILD_WITH_QT6 "Use Qt6 instead of default Qt5" OFF)
|
||||
option(CHATTERINO_GENERATE_COVERAGE "Generate coverage files" OFF)
|
||||
option(BUILD_SHARED_LIBS "" OFF)
|
||||
|
||||
option(USE_CONAN "Use conan" OFF)
|
||||
|
||||
@@ -84,7 +85,6 @@ endif()
|
||||
|
||||
if (BUILD_WITH_QTKEYCHAIN)
|
||||
# Link QtKeychain statically
|
||||
option(QTKEYCHAIN_STATIC "" ON)
|
||||
if (USE_SYSTEM_QTKEYCHAIN)
|
||||
find_package(Qt${MAJOR_QT_VERSION}Keychain REQUIRED)
|
||||
else()
|
||||
|
||||
+1
-1
Submodule lib/qtkeychain updated: de95462736...e5b070831c
Reference in New Issue
Block a user