tech-bash/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

BUILD FAILS! some ideas of storage and cache

Browse source
This commit is contained in:
Blue 2022-09-03 14:39:42 +03:00
parent 87973b3b67
commit 820dc845ea
Signed by untrusted user: blue
GPG key ID: 9B203B252A63EE38
10 changed files with 198 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

31
CMakeLists.txt
View file

@ -35,7 +35,12 @@ option(WITH_OMEMO "Build OMEMO support module" ON)
# Dependencies
## Qt
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets DBus Gui Xml Network Core)
if (NOT DEFINED QT_VERSION_MAJOR)
find_package(QT NAMES Qt6 Qt5 REQUIRED COMPONENTS Widgets DBus Gui Xml Network Core)
else ()
find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS Widgets DBus Gui Xml Network Core)
endif()
find_package(Boost COMPONENTS)
target_include_directories(squawk PRIVATE ${Boost_INCLUDE_DIRS})
@ -51,21 +56,15 @@ target_include_directories(squawk PRIVATE ${Qt${QT_VERSION_MAJOR}Core_INCLUDE_DI
if (WITH_OMEMO)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(OMEMO libomemo)
pkg_check_modules(OMEMO libomemo-c)
if (OMEMO_FOUND)
pkg_check_modules(SIGNAL libsignal-protocol-c)
if (SIGNAL_FOUND)
message("Building with support of OMEMO")
else ()
message("signal-protocol package wasn't found, trying to build without OMEMO support")
set(WITH_OMEMO OFF)
endif()
message("Building with support of OMEMO")
else ()
message("libomemo package wasn't found, trying to build without OMEMO support")
message("libomemo-c package wasn't found, trying to build without OMEMO support")
set(WITH_OMEMO OFF)
endif ()
else ()
message("PKG_CONFIG module wasn't found, can not check libomemo and libsignal-protocol support, trying to build without OMEMO support")
message("PKG_CONFIG module wasn't found, can not check libomemo-c support, trying to build without OMEMO support")
set(WITH_OMEMO OFF)
endif ()
endif ()
@ -129,16 +128,18 @@ endif()
if (NOT SYSTEM_QXMPP)
message("Building with bundled QXmpp")
target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/base)
target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/client)
if (WITH_OMEMO)
target_include_directories(squawk PRIVATE ${CMAKE_SOURCE_DIR}/external/qxmpp/src/omemo)
target_include_directories(squawk PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/external/qxmpp/src/omemo)
set(BUILD_OMEMO ON)
target_compile_definitions(squawk PRIVATE WITH_OMEMO)
else ()
set(BUILD_OMEMO OFF)
endif ()
add_subdirectory(external/qxmpp)
if (WITH_OMEMO)
target_include_directories(QXmppOmemo PRIVATE ${SIGNAL_INCLUDE_DIRS})
target_include_directories(QXmppOmemo PRIVATE ${OMEMO_INCLUDE_DIRS})
endif ()
target_link_libraries(squawk PRIVATE qxmpp)
else ()