qt6 build

This commit is contained in:
Blue 2024-12-14 01:53:04 +02:00
parent a04693e39d
commit d4cec645b5
Signed by: blue
GPG key ID: 9B203B252A63EE38
35 changed files with 279 additions and 632 deletions

View file

@ -7,7 +7,6 @@ cmake_policy(SET CMP0079 NEW)
cmake_policy(SET CMP0167 NEW)
set(CMAKE_CXX_STANDARD 17)
set(QT_VERSION_MAJOR 5)
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
@ -35,7 +34,6 @@ option(WITH_KWALLET "Build KWallet support module" ON)
option(WITH_KIO "Build KIO support module" ON)
option(WITH_KCONFIG "Build KConfig support module" ON)
option(WITH_OMEMO "Build OMEMO support module" OFF) #it should be off by default untill I sort the problems out
option(WITH_SIMPLE_CRYPT "Builds with SimpleCrypt to obfuscate password" ON)
# Dependencies
## Qt
@ -69,9 +67,9 @@ endif ()
## KIO
if (WITH_KIO)
find_package(KF5KIO CONFIG)
find_package(KF${QT_VERSION_MAJOR}KIO CONFIG)
if (NOT KF5KIO_FOUND)
if (NOT KF${QT_VERSION_MAJOR}KIO_FOUND)
set(WITH_KIO OFF)
message("KIO package wasn't found, KIO support modules wouldn't be built")
else ()
@ -82,9 +80,9 @@ endif ()
## KWallet
if (WITH_KWALLET)
find_package(KF5Wallet CONFIG)
find_package(KF${QT_VERSION_MAJOR}Wallet CONFIG)
if (NOT KF5Wallet_FOUND)
if (NOT KF${QT_VERSION_MAJOR}Wallet_FOUND)
set(WITH_KWALLET OFF)
message("KWallet package wasn't found, KWallet support module wouldn't be built")
else ()
@ -95,13 +93,13 @@ endif ()
## KConfig
if (WITH_KCONFIG)
find_package(KF5Config CONFIG)
if (NOT KF5Config_FOUND)
find_package(KF${QT_VERSION_MAJOR}Config CONFIG)
if (NOT KF${QT_VERSION_MAJOR}Config_FOUND)
set(WITH_KCONFIG OFF)
message("KConfig package wasn't found, KConfig support modules wouldn't be built")
else()
find_package(KF5ConfigWidgets CONFIG)
if (NOT KF5ConfigWidgets_FOUND)
find_package(KF${QT_VERSION_MAJOR}ConfigWidgets CONFIG)
if (NOT KF${QT_VERSION_MAJOR}ConfigWidgets_FOUND)
set(WITH_KCONFIG OFF)
message("KConfigWidgets package wasn't found, KConfigWidgets support modules wouldn't be built")
else()
@ -115,12 +113,12 @@ endif()
## QXmpp
if (SYSTEM_QXMPP)
if (WITH_OMEMO)
find_package(QXmpp CONFIG COMPONENTS Omemo)
find_package(QXmppQt${QT_VERSION_MAJOR} CONFIG COMPONENTS Omemo)
else ()
find_package(QXmpp CONFIG)
find_package(QXmppQt${QT_VERSION_MAJOR} CONFIG)
endif ()
if (NOT QXmpp_FOUND)
if (NOT QXmppQt${QT_VERSION_MAJOR}_FOUND)
set(SYSTEM_QXMPP OFF)
message("QXmpp package wasn't found, trying to build with bundled QXmpp")
else ()
@ -152,8 +150,8 @@ endif ()
## LMDBAL
if (SYSTEM_LMDBAL)
find_package(lmdbal)
if (NOT lmdbal_FOUND)
find_package(lmdbalqt${QT_VERSION_MAJOR})
if (NOT lmdbalqt${QT_VERSION_MAJOR}_FOUND)
set(SYSTEM_LMDBAL OFF)
message("LMDBAL package wasn't found, trying to build with bundled LMDBAL")
else ()
@ -163,9 +161,11 @@ else()
message("Building with bundled LMDBAL")
set(BUILD_STATIC ON)
add_subdirectory(external/lmdbal)
add_library(LMDBAL::LMDBAL ALIAS LMDBAL)
add_library(LMDBALQT${QT_VERSION_MAJOR}::LMDBALQT${QT_VERSION_MAJOR} ALIAS LMDBAL)
endif()
find_package(OpenSSL REQUIRED)
## Linking
target_link_libraries(squawk
PRIVATE
@ -175,7 +175,8 @@ target_link_libraries(squawk
Qt${QT_VERSION_MAJOR}::Network
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Xml
LMDBAL::LMDBAL
LMDBALQT${QT_VERSION_MAJOR}::LMDBALQT${QT_VERSION_MAJOR}
OpenSSL::Crypto
QXmpp::QXmpp
)
@ -183,12 +184,6 @@ if (WITH_OMEMO)
target_link_libraries(squawk PRIVATE QXmpp::Omemo)
endif ()
if (WITH_SIMPLE_CRYPT)
target_compile_definitions(squawk PRIVATE WITH_SIMPLE_CRYPT)
add_subdirectory(external/simpleCrypt)
target_link_libraries(squawk PRIVATE simpleCrypt)
endif ()
## Link thread libraries on Linux
if(UNIX AND NOT APPLE)
set(THREADS_PREFER_PTHREAD_FLAG ON)