diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ef163c82..4ea8f68c4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,10 +112,7 @@ set_package_properties(KQuickImageEditor PROPERTIES PURPOSE "Add image editing capability to image attachments" ) -find_package(QCoro${QT_MAJOR_VERSION} COMPONENTS Core QUIET) -if(NOT QCoro${QT_MAJOR_VERSION}_FOUND) - find_package(QCoro REQUIRED) -endif() +find_package(QCoro${QT_MAJOR_VERSION} 0.4 COMPONENTS Core REQUIRED) qcoro_enable_coroutines() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e52cdf621..7857c25df 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -91,12 +91,7 @@ else() endif() target_include_directories(neochat PRIVATE ${CMAKE_BINARY_DIR}) -target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES}) -if(TARGET QCoro5::Coro) - target_link_libraries(neochat PUBLIC QCoro5::Coro) -else() - target_link_libraries(neochat PUBLIC QCoro::QCoro) -endif() +target_link_libraries(neochat PUBLIC Qt::Core Qt::Quick Qt::Qml Qt::Gui Qt::Multimedia Qt::Network Qt::QuickControls2 KF5::I18n KF5::Kirigami2 KF5::Notifications KF5::ConfigCore KF5::ConfigGui KF5::CoreAddons KF5::SonnetCore KF5::ItemModels Quotient cmark::cmark ${QTKEYCHAIN_LIBRARIES} QCoro::Core) kconfig_add_kcfg_files(neochat GENERATE_MOC neochatconfig.kcfgc) if(NEOCHAT_FLATPAK)