From e3d083e7e8ecaae880c22113eff8f678c468e4f7 Mon Sep 17 00:00:00 2001 From: re2zero Date: Mon, 8 Apr 2024 17:39:19 +0800 Subject: [PATCH] chore: Fix debian CI It miss some header files and feature support check. Log: Fix debian CI --- src/plugins/cooperation/core/CMakeLists.txt | 8 ++++++++ src/plugins/cooperation/core/cooperationcoreplugin.cpp | 4 +++- src/plugins/cooperation/core/utils/cooperationutil.cpp | 2 +- src/plugins/data-transfer/core/CMakeLists.txt | 7 ++++++- .../core/gui/transfer/waittransferwidget.cpp | 1 + src/plugins/data-transfer/core/gui/type_defines.cpp | 1 + 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/plugins/cooperation/core/CMakeLists.txt b/src/plugins/cooperation/core/CMakeLists.txt index 075fa1651..92b8d33a0 100644 --- a/src/plugins/cooperation/core/CMakeLists.txt +++ b/src/plugins/cooperation/core/CMakeLists.txt @@ -63,6 +63,13 @@ elseif (CMAKE_SYSTEM MATCHES "Linux") "${CMAKE_CURRENT_SOURCE_DIR}/maincontroller/linux/*.cpp" ) find_package(Dtk COMPONENTS Widget REQUIRED) + find_path(FEATURE_DISPLAY_DIR dfeaturedisplaydialog.h PATHS ${DtkWidget_INCLUDE_DIRS}) + if (FEATURE_DISPLAY_DIR) + message(STATUS "Found dfeaturedisplaydialog.h at ${FEATURE_DISPLAY_DIR}") + add_definitions(-DHAVE_DTK_FEATUREDISPLAY) + else() + message(STATUS "Could not find dfeaturedisplaydialog.h") + endif() else() message (FATAL_ERROR "not support on ${CMAKE_SYSTEM} yet.") endif() @@ -94,6 +101,7 @@ target_link_libraries(${PROJECT_NAME} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network + Qt${QT_VERSION_MAJOR}::DBus co ) diff --git a/src/plugins/cooperation/core/cooperationcoreplugin.cpp b/src/plugins/cooperation/core/cooperationcoreplugin.cpp index e813eb104..a3cc19ed1 100644 --- a/src/plugins/cooperation/core/cooperationcoreplugin.cpp +++ b/src/plugins/cooperation/core/cooperationcoreplugin.cpp @@ -18,9 +18,11 @@ # include "proxy/cooperationproxy.h" #else # include "base/reportlog/reportlogmanager.h" +#ifdef HAVE_DTK_FEATUREDISPLAY # include DWIDGET_USE_NAMESPACE #endif +#endif using namespace cooperation_core; using namespace deepin_cross; @@ -58,7 +60,7 @@ bool CooperaionCorePlugin::start() if (CommonUitls::isFirstStart()) { emit MainController::instance()->firstStart(); -#ifdef linux +#ifdef HAVE_DTK_FEATUREDISPLAY DFeatureDisplayDialog *dlg = qApp->featureDisplayDialog(); auto btn = dlg->getButton(0); connect(btn, &QAbstractButton::clicked, qApp, &SingleApplication::helpActionTriggered); diff --git a/src/plugins/cooperation/core/utils/cooperationutil.cpp b/src/plugins/cooperation/core/utils/cooperationutil.cpp index 5a80c4265..2f18c8d33 100644 --- a/src/plugins/cooperation/core/utils/cooperationutil.cpp +++ b/src/plugins/cooperation/core/utils/cooperationutil.cpp @@ -527,7 +527,7 @@ QString CooperationUtil::localIPAddress() void CooperationUtil::showFeatureDisplayDialog(QDialog *dlg1) { -#ifdef linux +#ifdef HAVE_DTK_FEATUREDISPLAY DFeatureDisplayDialog *dlg = static_cast(dlg1); auto btn = dlg->getButton(0); btn->setText(tr("View Help Manual")); diff --git a/src/plugins/data-transfer/core/CMakeLists.txt b/src/plugins/data-transfer/core/CMakeLists.txt index 31e0143fc..4d691b4a7 100644 --- a/src/plugins/data-transfer/core/CMakeLists.txt +++ b/src/plugins/data-transfer/core/CMakeLists.txt @@ -58,7 +58,7 @@ else() endif() if (WIN32) - set(qt_required_components Core Gui Network Widgets Sql WinExtras) + set(qt_required_components Core Gui Network Widgets Sql WinExtras) else() set(qt_required_components Core Gui Network Widgets DBus) endif() @@ -81,6 +81,10 @@ target_include_directories(${PROJECT_NAME} ${CMAKE_SOURCE_DIR}/src/ ) +if (Qt5DBus_FOUND) + include_directories(${Qt5DBus_INCLUDE_DIRS}) +endif (Qt5DBus_FOUND) + # 公共依赖库,添加到这里 target_link_libraries(${PROJECT_NAME} deepin_cross::framework @@ -88,6 +92,7 @@ target_link_libraries(${PROJECT_NAME} Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network + Qt${QT_VERSION_MAJOR}::DBus co ) diff --git a/src/plugins/data-transfer/core/gui/transfer/waittransferwidget.cpp b/src/plugins/data-transfer/core/gui/transfer/waittransferwidget.cpp index 3fadf252d..0dc56a15e 100644 --- a/src/plugins/data-transfer/core/gui/transfer/waittransferwidget.cpp +++ b/src/plugins/data-transfer/core/gui/transfer/waittransferwidget.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include diff --git a/src/plugins/data-transfer/core/gui/type_defines.cpp b/src/plugins/data-transfer/core/gui/type_defines.cpp index 929cce003..e914d074e 100644 --- a/src/plugins/data-transfer/core/gui/type_defines.cpp +++ b/src/plugins/data-transfer/core/gui/type_defines.cpp @@ -7,6 +7,7 @@ #ifdef linux # include +# include DWIDGET_USE_NAMESPACE #endif