From 646bbcf3e8adf5d8f8004295214fef792978658f Mon Sep 17 00:00:00 2001 From: justforlxz Date: Wed, 28 Aug 2019 21:31:03 +0800 Subject: [PATCH] chore: fix build faild cause missing dtkgui build dep --- debian/control | 3 ++- frame/CMakeLists.txt | 3 +++ frame/item/components/appsnapshot.h | 1 + frame/util/dockpopupwindow.h | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 16d0f9c99..92c659f57 100644 --- a/debian/control +++ b/debian/control @@ -24,7 +24,8 @@ Build-Depends: debhelper (>= 8.0.0), cmake, libdde-network-utils-dev, libdbusmenu-qt5-dev, - clang [mips64el] + clang [mips64el], + libdtkgui-dev Standards-Version: 3.9.8 Homepage: http://www.deepin.org/ diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 2a6a858dc..e36c3412f 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -19,6 +19,7 @@ find_package(DtkCMake REQUIRED) pkg_check_modules(XCB_EWMH REQUIRED xcb-ewmh x11) pkg_check_modules(DFrameworkDBus REQUIRED dframeworkdbus) pkg_check_modules(QGSettings REQUIRED gsettings-qt) +pkg_check_modules(DtkGUI REQUIRED dtkgui) # driver-manager add_executable(${BIN_NAME} ${SRCS} ${INTERFACES} item/item.qrc frame.qrc) @@ -28,6 +29,7 @@ target_include_directories(${BIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${PROJECT_BINARY_DIR} ${QGSettings_INCLUDE_DIRS} + ${DtkGUI_INCLUDE_DIRS} ../interfaces) target_link_libraries(${BIN_NAME} PRIVATE ${XCB_EWMH_LIBRARIES} @@ -38,6 +40,7 @@ target_link_libraries(${BIN_NAME} PRIVATE ${Qt5X11Extras_LIBRARIES} ${Qt5DBus_LIBRARIES} ${QGSettings_LIBRARIES} + ${DtkGUI_LIBRARIES} ) if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "sw_64") diff --git a/frame/item/components/appsnapshot.h b/frame/item/components/appsnapshot.h index 52bfcea7d..7d2e5fa35 100644 --- a/frame/item/components/appsnapshot.h +++ b/frame/item/components/appsnapshot.h @@ -33,6 +33,7 @@ #include DWIDGET_USE_NAMESPACE +DGUI_USE_NAMESPACE #define SNAP_WIDTH 200 #define SNAP_HEIGHT 130 diff --git a/frame/util/dockpopupwindow.h b/frame/util/dockpopupwindow.h index 5963389d7..0ad857658 100644 --- a/frame/util/dockpopupwindow.h +++ b/frame/util/dockpopupwindow.h @@ -27,6 +27,7 @@ #include DWIDGET_USE_NAMESPACE +DGUI_USE_NAMESPACE class DockPopupWindow : public Dtk::Widget::DArrowRectangle {