From db802b6b174c3ba32364c3bf2860f9aa1b68b5f2 Mon Sep 17 00:00:00 2001 From: Bart De Vries Date: Thu, 6 Oct 2022 16:32:38 +0200 Subject: [PATCH] Look for, and link to, Kirigami and QtSvg on all platforms I don't know why they were historically only included for Android. But this fixes qt6 porting. --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d24cb886..861e8459 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ ecm_setup_version(${PROJECT_VERSION} VERSION_HEADER ${CMAKE_CURRENT_BINARY_DIR}/kasts-version.h ) -find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Sql Multimedia) +find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Sql Multimedia Svg) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS CoreAddons Kirigami2 Syndication Config I18n ThreadWeaver) find_package(Taglib REQUIRED) find_package(Qt${QT_MAJOR_VERSION}Keychain) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 97a3891f..35088835 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -164,12 +164,10 @@ add_executable(kasts ${SRCS}) kconfig_add_kcfg_files(kasts settingsmanager.kcfgc GENERATE_MOC) target_include_directories(kasts PRIVATE ${CMAKE_BINARY_DIR}) -target_link_libraries(kasts PRIVATE Qt::Core Qt::Qml Qt::Quick Qt::QuickControls2 Qt::Sql Qt::Multimedia KF5::Syndication KF5::CoreAddons KF5::ConfigGui KF5::I18n Taglib::Taglib KastsSolidExtras ${QTKEYCHAIN_LIBRARIES} KF5::ThreadWeaver) +target_link_libraries(kasts PRIVATE Qt::Core Qt::Qml Qt::Quick Qt::QuickControls2 Qt::Sql Qt::Multimedia Qt::Svg KF5::Kirigami2 KF5::Syndication KF5::CoreAddons KF5::ConfigGui KF5::I18n Taglib::Taglib KastsSolidExtras ${QTKEYCHAIN_LIBRARIES} KF5::ThreadWeaver) if(ANDROID) target_link_libraries(kasts PRIVATE - KF5::Kirigami2 - Qt::Svg OpenSSL::SSL log )