mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUILD: Switch to Qt 6 and C++17

Browse Source
This commit is contained in:
Davide Beatrici 2024-09-17 02:29:31 +02:00
parent ef97a5d88f
commit de91daae08
34 changed files with 109 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -23,7 +23,7 @@ environment:
matrix:
- MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2024-07-22.9ad0398d8'
install:
- ps: .ci/install-environment_windows.ps1

10
.ci/azure-pipelines/install-environment_linux.bash
View File

@ -12,10 +12,12 @@ sudo apt -y install \
g++-multilib \
ninja-build \
pkg-config \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
libqt5svg5-dev \
qt6-base-dev \
qt6-l10n-tools \
qt6-tools-dev \
qt6-tools-dev-tools \
libqt6svg6-dev \
libgl-dev \
libboost-dev \
libssl-dev \
libprotobuf-dev \

4
.ci/azure-pipelines/main-pr.yml
View File

@ -24,7 +24,7 @@ jobs:
pool:
vmImage: 'windows-2022'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2024-07-22.9ad0398d8'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
steps:
- template: steps_windows.yml
@ -45,7 +45,7 @@ jobs:
pool:
vmImage: 'macOS-12'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2024-08-17.9ad0398d8'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
steps:
- template: steps_macos.yml

4
.ci/azure-pipelines/main.yml
View File

@ -22,7 +22,7 @@ jobs:
pool:
vmImage: 'windows-2022'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-windows-static-md-release.2024-07-22.9ad0398d8'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-windows-static-md-release'
steps:
- template: steps_windows.yml
@ -43,7 +43,7 @@ jobs:
pool:
vmImage: 'macOS-12'
variables:
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2023-12-31.6a3ce9c65'
MUMBLE_ENVIRONMENT_VERSION: 'mumble_env.x64-osx-release.2024-08-17.9ad0398d8'
MUMBLE_ENVIRONMENT_TRIPLET: 'x64-osx-release'
steps:
- template: steps_macos.yml

2
.cirrus.yml
View File

@ -8,7 +8,7 @@ freebsd_instance:
freebsd_task:
pkg_script:
- pkg update && pkg upgrade -y
- pkg install -y git ninja pkgconf cmake qt5-buildtools qt5-qmake qt5-linguisttools qt5-concurrent qt5-network qt5-xml qt5-sql qt5-svg qt5-testlib boost-libs libsndfile protobuf ice37 avahi-libdns poco opus
- pkg install -y git ninja pkgconf cmake qt6-base qt6-svg qt6-tools boost-libs libsndfile protobuf ice37 avahi-libdns poco opus
fetch_submodules_script: git submodule --quiet update --init --recursive
build_script:
- mkdir build && cd build

22
.github/actions/install-dependencies/install_ubuntu_shared_64bit.sh vendored
View File

@ -1,5 +1,7 @@
#!/usr/bin/env bash
. /etc/os-release
sudo apt update
sudo apt -y install \
@ -7,10 +9,8 @@ sudo apt -y install \
g++-multilib \
ninja-build \
pkg-config \
qtbase5-dev \
qttools5-dev \
qttools5-dev-tools \
libqt5svg5-dev \
qt6-base-dev \
qt6-tools-dev \
libboost-dev \
libssl-dev \
libprotobuf-dev \
@ -30,3 +30,17 @@ sudo apt -y install \
zsync \
appstream \
libpoco-dev
# The package was initially called libqt6svg6-dev.
# Choose correct name based on the Ubuntu version.
if [[ $VERSION_ID = "22.04" ]]
then
# libgl-dev is required in order for GUI-related components to be found by CMake.
# qt6-l10n-tools and qt6-tools-dev-tools are required in order for LinguistTools to be found by CMake.
sudo apt -y install libgl-dev \
libqt6svg6-dev \
qt6-l10n-tools \
qt6-tools-dev-tools
else
sudo apt -y install qt6-svg-dev
fi

4
CMakeLists.txt
View File

@ -45,10 +45,10 @@ list(APPEND CMAKE_MODULE_PATH
)
if(NOT DEFINED CMAKE_CXX_STANDARD)
set(CMAKE_CXX_STANDARD 14)
set(CMAKE_CXX_STANDARD 17)
endif()
set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.13)
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.15)
include(pkg-utils)

3
cmake/compiler.cmake
View File

@ -66,9 +66,6 @@ if(MSVC)
"/ignore:4099"
)
endif()
# Workaround for MSVC 17.8 breaking change. (fixed in Qt 5.15.17)
add_compile_definitions(_SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING)
elseif(UNIX OR MINGW)
add_compile_options(
"-fvisibility=hidden"

10
cmake/os.cmake
View File

@ -44,7 +44,6 @@ else()
endif()
find_pkg(OpenSSL QUIET)
find_pkg(Qt5 QUIET)
if(NOT OpenSSL_FOUND)
if(APPLE)
@ -52,13 +51,4 @@ else()
set(OPENSSL_ROOT_DIR "/usr/local/opt/openssl")
endif()
endif()
if(NOT Qt5_FOUND)
if(APPLE)
# Homebrew
set(Qt5_DIR "/usr/local/opt/qt5/lib/cmake/Qt5")
elseif(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
set(Qt5_DIR "/usr/local/lib/qt5/cmake/Qt5")
endif()
endif()
endif()

6
cmake/qt-utils.cmake
View File

@ -37,7 +37,7 @@ function(include_qt_plugin TARGET SCOPE PLUGIN)
endfunction()
function(compile_translations OUT_VAR OUT_DIR TS_FILES)
find_pkg(Qt5 COMPONENTS LinguistTools REQUIRED)
find_pkg(Qt6 COMPONENTS LinguistTools REQUIRED)
# Create output directory
file(MAKE_DIRECTORY "${OUT_DIR}")
@ -47,7 +47,7 @@ function(compile_translations OUT_VAR OUT_DIR TS_FILES)
# Compile the given .ts files into .qm files into the output directory
foreach(CURRENT_TS IN LISTS TS_FILES)
set_source_files_properties("${CURRENT_TS}" PROPERTIES OUTPUT_LOCATION "${OUT_DIR}")
qt5_add_translation(COMPILED_FILES "${CURRENT_TS}")
qt6_add_translation(COMPILED_FILES "${CURRENT_TS}")
endforeach()
# return the list of compiled .qm files
@ -96,7 +96,7 @@ endfunction()
function(query_qmake OUT_VAR PROP)
# Get the path to the qmake executable
get_target_property(QT_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
get_target_property(QT_QMAKE_EXECUTABLE Qt6::qmake IMPORTED_LOCATION)
# Query qmake for the location of the installed Qt translations
execute_process(

8
helpers/g15helper/CMakeLists.txt
View File

@ -28,14 +28,14 @@ set_target_properties(g15-helper
target_compile_definitions(g15-helper PRIVATE $<$<CONFIG:Debug>:USE_LOGFILE>)
if(g15-emulator)
find_pkg(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
find_pkg(Qt6 COMPONENTS Core Gui Widgets REQUIRED)
set_target_properties(g15-helper PROPERTIES AUTOMOC ON)
target_sources(g15-helper PRIVATE "g15helper_emu.cpp" "g15helper_emu.h")
target_link_libraries(g15-helper PRIVATE Qt5::Core Qt5::Gui Qt5::Widgets)
target_link_libraries(g15-helper PRIVATE Qt6::Core Qt6::Gui Qt6::Widgets)
if(static AND WIN32 AND TARGET Qt5::QWindowsIntegrationPlugin)
if(static AND WIN32 AND TARGET Qt6::QWindowsIntegrationPlugin)
include_qt_plugin(g15-helper PRIVATE QWindowsIntegrationPlugin)
target_link_libraries(g15-helper PRIVATE Qt5::QWindowsIntegrationPlugin)
target_link_libraries(g15-helper PRIVATE Qt6::QWindowsIntegrationPlugin)
endif()
else()
if(MSVC)

8
src/CMakeLists.txt
View File

@ -17,7 +17,7 @@ option(tracy "Enable the tracy profiler." OFF)
option(bundled-gsl "Use the bundled GSL version instead of looking for one on the system" ON)
find_pkg(Qt5
find_pkg(Qt6
COMPONENTS
Core
Network
@ -176,9 +176,9 @@ target_link_libraries(shared
protobuf::libprotobuf
OpenSSL::Crypto
OpenSSL::SSL
Qt5::Core
Qt5::Network
Qt5::Xml
Qt6::Core
Qt6::Network
Qt6::Xml
)
if(WIN32)

42
src/mumble/CMakeLists.txt
View File

@ -73,7 +73,7 @@ if(MSVC)
option(elevation "Set \"uiAccess=true\", required for global shortcuts to work with privileged applications. Requires the client's executable to be signed with a trusted code signing certificate." OFF)
endif()
find_pkg(Qt5
find_pkg(Qt6
COMPONENTS
Concurrent
Sql
@ -541,24 +541,24 @@ target_link_libraries(mumble_client_object_lib
PUBLIC
shared
utfcpp
Qt5::Concurrent
Qt5::Sql
Qt5::Svg
Qt5::Widgets
Qt6::Concurrent
Qt6::Sql
Qt6::Svg
Qt6::Widgets
)
if(static)
if(TARGET Qt5::QSQLiteDriverPlugin)
if(TARGET Qt6::QSQLiteDriverPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE "QSQLiteDriverPlugin")
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QSQLiteDriverPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QSQLiteDriverPlugin)
endif()
if(TARGET Qt5::QSvgIconPlugin)
if(TARGET Qt6::QSvgIconPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE "QSvgIconPlugin")
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QSvgIconPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QSvgIconPlugin)
endif()
if(TARGET Qt5::QSvgPlugin)
if(TARGET Qt6::QSvgPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE "QSvgPlugin")
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QSvgPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QSvgPlugin)
endif()
endif()
@ -596,9 +596,9 @@ if(WIN32)
REQUIRED
)
if(static AND TARGET Qt5::QWindowsIntegrationPlugin)
if(static AND TARGET Qt6::QWindowsIntegrationPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE QWindowsIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QWindowsIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QWindowsIntegrationPlugin)
endif()
add_subdirectory("${3RDPARTY_DIR}/SPSCQueue" "${CMAKE_CURRENT_BINARY_DIR}/SPSCQueue" EXCLUDE_FROM_ALL)
@ -648,9 +648,9 @@ else()
target_compile_definitions(mumble_client_object_lib PUBLIC "NO_XINPUT2")
endif()
if(static AND TARGET Qt5::QXcbIntegrationPlugin)
if(static AND TARGET Qt6::QXcbIntegrationPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE QXcbIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QXcbIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QXcbIntegrationPlugin)
endif()
target_sources(mumble_client_object_lib
@ -685,9 +685,9 @@ else()
"os_macx.mm"
)
if(static AND TARGET Qt5::QCocoaIntegrationPlugin)
if(static AND TARGET Qt6::QCocoaIntegrationPlugin)
include_qt_plugin(mumble_client_object_lib PRIVATE QCocoaIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::QCocoaIntegrationPlugin)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::QCocoaIntegrationPlugin)
endif()
target_link_libraries(mumble_client_object_lib
@ -769,9 +769,9 @@ if(renamenoise)
endif()
if(qtspeech)
find_pkg(Qt5 COMPONENTS TextToSpeech REQUIRED)
find_pkg(Qt6 COMPONENTS TextToSpeech REQUIRED)
target_sources(mumble_client_object_lib PRIVATE "TextToSpeech.cpp")
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::TextToSpeech)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::TextToSpeech)
elseif(WIN32)
target_sources(mumble_client_object_lib PRIVATE "TextToSpeech_win.cpp")
if(MINGW)
@ -822,7 +822,7 @@ if(NOT update)
endif()
if(NOT WIN32 AND NOT APPLE)
find_pkg(Qt5 COMPONENTS DBus REQUIRED)
find_pkg(Qt6 COMPONENTS DBus REQUIRED)
target_sources(mumble_client_object_lib
PRIVATE
@ -831,7 +831,7 @@ if(NOT WIN32 AND NOT APPLE)
)
target_compile_definitions(mumble_client_object_lib PUBLIC "USE_DBUS")
target_link_libraries(mumble_client_object_lib PUBLIC Qt5::DBus)
target_link_libraries(mumble_client_object_lib PUBLIC Qt6::DBus)
endif()
if(translations)

2
src/mumble/PluginUpdater.h
View File

@ -28,8 +28,6 @@ struct UpdateWidgetPair {
/// A helper struct to store a pair of a plugin ID and an URL corresponding to
/// the same plugin.
struct UpdateEntry {
UpdateEntry() = default;
plugin_id_t pluginID = std::numeric_limits< plugin_id_t >::max();
QUrl updateURL;
QString fileName;

41
src/murmur/CMakeLists.txt
View File

@ -16,7 +16,7 @@ include(qt-utils)
option(ice "Build support for Ice RPC." ON)
find_pkg(Qt5 COMPONENTS Sql REQUIRED)
find_pkg(Qt6 COMPONENTS Sql REQUIRED)
set(MURMUR_SOURCES
"main.cpp"
@ -78,32 +78,32 @@ target_include_directories(mumble-server PRIVATE
${SHARED_SOURCE_DIR}
)
target_link_libraries(mumble-server PRIVATE shared Qt5::Sql)
target_link_libraries(mumble-server PRIVATE shared Qt6::Sql)
if(static)
# MariaDB and MySQL
if(TARGET Qt5::QMYSQLDriverPlugin)
if(TARGET Qt6::QMYSQLDriverPlugin)
include_qt_plugin(mumble-server PRIVATE "QMYSQLDriverPlugin")
target_link_libraries(mumble-server PRIVATE Qt5::QMYSQLDriverPlugin)
target_link_libraries(mumble-server PRIVATE Qt6::QMYSQLDriverPlugin)
endif()
# Open DataBase Connectivity
if(TARGET Qt5::QODBCDriverPlugin)
if(TARGET Qt6::QODBCDriverPlugin)
include_qt_plugin(mumble-server PRIVATE "QODBCDriverPlugin")
target_link_libraries(mumble-server PRIVATE Qt5::QODBCDriverPlugin)
target_link_libraries(mumble-server PRIVATE Qt6::QODBCDriverPlugin)
if(WIN32)
find_library(LIB_ODBC32 "odbc32")
target_link_libraries(mumble-server PRIVATE ${LIB_ODBC32})
endif()
endif()
# PostgreSQL
if(TARGET Qt5::QPSQLDriverPlugin)
if(TARGET Qt6::QPSQLDriverPlugin)
include_qt_plugin(mumble-server PRIVATE "QPSQLDriverPlugin")
target_link_libraries(mumble-server PRIVATE Qt5::QPSQLDriverPlugin)
target_link_libraries(mumble-server PRIVATE Qt6::QPSQLDriverPlugin)
endif()
# SQLite
if(TARGET Qt5::QSQLiteDriverPlugin)
if(TARGET Qt6::QSQLiteDriverPlugin)
include_qt_plugin(mumble-server PRIVATE "QSQLiteDriverPlugin")
target_link_libraries(mumble-server PRIVATE Qt5::QSQLiteDriverPlugin)
target_link_libraries(mumble-server PRIVATE Qt6::QSQLiteDriverPlugin)
endif()
endif()
@ -125,19 +125,19 @@ if(WIN32)
AUTORCC ON
)
find_pkg(Qt5 COMPONENTS Widgets REQUIRED)
find_pkg(Qt6 COMPONENTS Widgets REQUIRED)
target_link_libraries(mumble-server
PRIVATE
Qt5::Widgets
Qt6::Widgets
dbghelp.lib
shlwapi.lib
rpcrt4.lib
)
if(static AND TARGET Qt5::QWindowsIntegrationPlugin)
if(static AND TARGET Qt6::QWindowsIntegrationPlugin)
include_qt_plugin(mumble-server PRIVATE QWindowsIntegrationPlugin)
target_link_libraries(mumble-server PRIVATE Qt5::QWindowsIntegrationPlugin)
target_link_libraries(mumble-server PRIVATE Qt6::QWindowsIntegrationPlugin)
endif()
else()
target_sources(mumble-server
@ -184,7 +184,7 @@ if(zeroconf)
endif()
if(NOT WIN32 AND NOT APPLE)
find_pkg(Qt5 COMPONENTS DBus REQUIRED)
find_pkg(Qt6 COMPONENTS DBus REQUIRED)
target_sources(mumble-server
PRIVATE
@ -193,7 +193,7 @@ if(NOT WIN32 AND NOT APPLE)
)
target_compile_definitions(mumble-server PUBLIC "USE_DBUS")
target_link_libraries(mumble-server PRIVATE Qt5::DBus)
target_link_libraries(mumble-server PRIVATE Qt6::DBus)
endif()
if(ice)
@ -265,8 +265,17 @@ if(ice)
target_include_directories(mumble-server PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
if(static)
# BZip2 is used by Ice, specifically in ConnectionI.cpp.
# We link to the library explicitly because CMake is not aware of the dependency.
# TODO: Fix or rewrite the official FindIce.cmake.
find_pkg(BZip2 REQUIRED)
endif()
target_link_libraries(mumble-server
PRIVATE
$<TARGET_NAME_IF_EXISTS:BZip2::BZip2>
Ice::Ice
Ice::IceSSL
$<TARGET_NAME_IF_EXISTS:Ice::IceDiscovery>

2
src/tests/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
find_pkg(Qt5 COMPONENTS Test REQUIRED)
find_pkg(Qt6 COMPONENTS Test REQUIRED)
option(online-tests "Whether or not tests that need a working internet connection should be included" OFF)

2
src/tests/TestAudioReceiverBuffer/CMakeLists.txt
View File

@ -7,7 +7,7 @@ add_executable(TestAudioReceiverBuffer TestAudioReceiverBuffer.cpp)
set_target_properties(TestAudioReceiverBuffer PROPERTIES AUTOMOC ON)
target_link_libraries(TestAudioReceiverBuffer PRIVATE shared Qt5::Test)
target_link_libraries(TestAudioReceiverBuffer PRIVATE shared Qt6::Test)
target_include_directories(TestAudioReceiverBuffer PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")

2
src/tests/TestCrypt/CMakeLists.txt
View File

@ -9,6 +9,6 @@ set_target_properties(TestCrypt PROPERTIES AUTOMOC ON)
target_include_directories(TestCrypt PRIVATE "${CMAKE_SOURCE_DIR}/src/murmur")
target_link_libraries(TestCrypt PRIVATE shared Qt5::Test)
target_link_libraries(TestCrypt PRIVATE shared Qt6::Test)
add_test(NAME TestCrypt COMMAND $<TARGET_FILE:TestCrypt>)

2
src/tests/TestCryptographicHash/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestCryptographicHash TestCryptographicHash.cpp)
set_target_properties(TestCryptographicHash PROPERTIES AUTOMOC ON)
target_link_libraries(TestCryptographicHash PRIVATE shared Qt5::Test)
target_link_libraries(TestCryptographicHash PRIVATE shared Qt6::Test)
add_test(NAME TestCryptographicHash COMMAND $<TARGET_FILE:TestCryptographicHash>)

2
src/tests/TestCryptographicRandom/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestCryptographicRandom TestCryptographicRandom.cpp)
set_target_properties(TestCryptographicRandom PROPERTIES AUTOMOC ON)
target_link_libraries(TestCryptographicRandom PRIVATE shared Qt5::Test)
target_link_libraries(TestCryptographicRandom PRIVATE shared Qt6::Test)
add_test(NAME TestCryptographicRandom COMMAND $<TARGET_FILE:TestCryptographicRandom>)

2
src/tests/TestFFDHE/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestFFDHE TestFFDHE.cpp)
set_target_properties(TestFFDHE PROPERTIES AUTOMOC ON)
target_link_libraries(TestFFDHE PRIVATE shared Qt5::Test)
target_link_libraries(TestFFDHE PRIVATE shared Qt6::Test)
add_test(NAME TestFFDHE COMMAND $<TARGET_FILE:TestFFDHE>)

2
src/tests/TestMumbleProtocol/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestMumbleProtocol TestMumbleProtocol.cpp)
set_target_properties(TestMumbleProtocol PROPERTIES AUTOMOC ON)
target_link_libraries(TestMumbleProtocol PRIVATE shared Qt5::Test)
target_link_libraries(TestMumbleProtocol PRIVATE shared Qt6::Test)
add_test(NAME TestMumbleProtocol COMMAND $<TARGET_FILE:TestMumbleProtocol>)

2
src/tests/TestPacketDataStream/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestPacketDataStream TestPacketDataStream.cpp)
set_target_properties(TestPacketDataStream PROPERTIES AUTOMOC ON)
target_link_libraries(TestPacketDataStream PRIVATE shared Qt5::Test)
target_link_libraries(TestPacketDataStream PRIVATE shared Qt6::Test)
add_test(NAME TestPacketDataStream COMMAND $<TARGET_FILE:TestPacketDataStream>)

2
src/tests/TestPasswordGenerator/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestPasswordGenerator TestPasswordGenerator.cpp)
set_target_properties(TestPasswordGenerator PROPERTIES AUTOMOC ON)
target_link_libraries(TestPasswordGenerator PRIVATE shared Qt5::Test)
target_link_libraries(TestPasswordGenerator PRIVATE shared Qt6::Test)
add_test(NAME TestPasswordGenerator COMMAND $<TARGET_FILE:TestPasswordGenerator>)

2
src/tests/TestSSLLocks/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestSSLLocks TestSSLLocks.cpp)
set_target_properties(TestSSLLocks PROPERTIES AUTOMOC ON)
target_link_libraries(TestSSLLocks PRIVATE shared Qt5::Test)
target_link_libraries(TestSSLLocks PRIVATE shared Qt6::Test)
add_test(NAME TestSSLLocks COMMAND $<TARGET_FILE:TestSSLLocks>)

2
src/tests/TestSelfSignedCertificate/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestSelfSignedCertificate TestSelfSignedCertificate.cpp)
set_target_properties(TestSelfSignedCertificate PROPERTIES AUTOMOC ON)
target_link_libraries(TestSelfSignedCertificate PRIVATE shared Qt5::Test)
target_link_libraries(TestSelfSignedCertificate PRIVATE shared Qt6::Test)
add_test(NAME TestSelfSignedCertificate COMMAND $<TARGET_FILE:TestSelfSignedCertificate>)

2
src/tests/TestServerAddress/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestServerAddress TestServerAddress.cpp)
set_target_properties(TestServerAddress PROPERTIES AUTOMOC ON)
target_link_libraries(TestServerAddress PRIVATE shared Qt5::Test)
target_link_libraries(TestServerAddress PRIVATE shared Qt6::Test)
add_test(NAME TestServerAddress COMMAND $<TARGET_FILE:TestServerAddress>)

2
src/tests/TestServerResolver/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestServerResolver TestServerResolver.cpp)
set_target_properties(TestServerResolver PROPERTIES AUTOMOC ON)
target_link_libraries(TestServerResolver PRIVATE shared Qt5::Test)
target_link_libraries(TestServerResolver PRIVATE shared Qt6::Test)
add_test(NAME TestServerResolver COMMAND $<TARGET_FILE:TestServerResolver>)

4
src/tests/TestSettingsJSONSerialization/CMakeLists.txt
View File

@ -3,7 +3,7 @@
# that can be found in the LICENSE file at the root of the
# Mumble source tree or at <https://www.mumble.info/LICENSE>.
find_pkg(Qt5 COMPONENTS Widgets REQUIRED)
find_pkg(Qt6 COMPONENTS Widgets REQUIRED)
# kpCertificate: We can't create a value for that on-the-fly, so we have to exclude it from the test
# All other: These settings are not saved
@ -42,7 +42,7 @@ add_custom_command(
add_executable(TestSettingsJSONSerialization "${TEST_CASE_SOURCE_FILE}")
target_link_libraries(TestSettingsJSONSerialization PRIVATE mumble_client_object_lib)
target_link_libraries(TestSettingsJSONSerialization PRIVATE Qt5::Test)
target_link_libraries(TestSettingsJSONSerialization PRIVATE Qt6::Test)
set_target_properties(TestSettingsJSONSerialization PROPERTIES AUTOMOC ON)

2
src/tests/TestStdAbs/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestStdAbs TestStdAbs.cpp)
set_target_properties(TestStdAbs PROPERTIES AUTOMOC ON)
target_link_libraries(TestStdAbs PRIVATE shared Qt5::Test)
target_link_libraries(TestStdAbs PRIVATE shared Qt6::Test)
add_test(NAME TestStdAbs COMMAND $<TARGET_FILE:TestStdAbs>)

2
src/tests/TestTimer/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestTimer TestTimer.cpp)
set_target_properties(TestTimer PROPERTIES AUTOMOC ON)
target_link_libraries(TestTimer PRIVATE shared Qt5::Test)
target_link_libraries(TestTimer PRIVATE shared Qt6::Test)
add_test(NAME TestTimer COMMAND $<TARGET_FILE:TestTimer>)

2
src/tests/TestUnresolvedServerAddress/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestUnresolvedServerAddress TestUnresolvedServerAddress.cpp)
set_target_properties(TestUnresolvedServerAddress PROPERTIES AUTOMOC ON)
target_link_libraries(TestUnresolvedServerAddress PRIVATE shared Qt5::Test)
target_link_libraries(TestUnresolvedServerAddress PRIVATE shared Qt6::Test)
add_test(NAME TestUnresolvedServerAddress COMMAND $<TARGET_FILE:TestUnresolvedServerAddress>)

2
src/tests/TestVersion/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_executable(TestVersion TestVersion.cpp)
set_target_properties(TestVersion PROPERTIES AUTOMOC ON)
target_link_libraries(TestVersion PRIVATE shared Qt5::Test)
target_link_libraries(TestVersion PRIVATE shared Qt6::Test)
add_test(NAME TestVersion COMMAND $<TARGET_FILE:TestVersion>)

2
src/tests/TestXMLTools/CMakeLists.txt
View File

@ -18,6 +18,6 @@ set_target_properties(TestXMLTools PROPERTIES AUTOMOC ON)
target_include_directories(TestXMLTools PRIVATE ${MUMBLE_SOURCE_DIR})
target_link_libraries(TestXMLTools PRIVATE shared Qt5::Test)
target_link_libraries(TestXMLTools PRIVATE shared Qt6::Test)
add_test(NAME TestXMLTools COMMAND $<TARGET_FILE:TestXMLTools>)