From 67d77222b917a80908e2eccd0ce666b50c88fc4d Mon Sep 17 00:00:00 2001 From: chenhongtao Date: Wed, 1 Nov 2023 17:42:59 +0800 Subject: [PATCH] chore: use new target link of dde-control-center Log: --- archlinux/PKGBUILD | 2 +- dcc-network-plugin/CMakeLists.txt | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD index 73ea9423..223610e9 100644 --- a/archlinux/PKGBUILD +++ b/archlinux/PKGBUILD @@ -10,7 +10,7 @@ pkgdesc='the library of network libdde-network-core module' arch=('x86_64' 'aarch64') url="https://github.com/linuxdeepin/dde-network-core" license=('GPL3') -depends=('deepin-qt-dbus-factory-git' 'gio-qt' 'gsettings-qt' 'networkmanager-qt' 'deepin-session-shell-git' 'deepin-dock-git' +depends=('deepin-qt-dbus-factory-git' 'gio-qt' 'gsettings-qt' 'networkmanager-qt5' 'deepin-session-shell-git' 'deepin-dock-git' 'deepin-control-center-git') makedepends=('qt5-tools' 'cmake' 'ninja' 'gtest' 'dtkcommon-git') conflicts=('deepin-network-core' 'deepin-network-utils-git') diff --git a/dcc-network-plugin/CMakeLists.txt b/dcc-network-plugin/CMakeLists.txt index ee63aac2..be55963e 100644 --- a/dcc-network-plugin/CMakeLists.txt +++ b/dcc-network-plugin/CMakeLists.txt @@ -57,12 +57,7 @@ add_library(${PLUGIN_NAME} SHARED ${SRCS}) target_include_directories(${PLUGIN_NAME} PUBLIC window operation - ${Qt5Widgets_INCLUDE_DIRS} - ${DtkWidget_INCLUDE_DIRS} - ${DdeControlCenter_INCLUDE_DIR} - ${Qt5DBus_INCLUDE_DIRS} ${KF5_QT_INCLUDE_DIRS} - ${Qt5Network_INCLUDE_DIRS} ${NETINTERFACEINCLUDE} ${DDE-Network-Core_INCLUDE_DIRS} ) @@ -70,14 +65,13 @@ target_include_directories(${PLUGIN_NAME} PUBLIC # 变量 ${DtkWidget_LIBRARIES} 和 ${Qt5Widgets_LIBRARIES} 是在前面执行 find_package 命令时引入的 # 当出现运行时错误提示某些符号没有定义时应该检查此处是否将所有用的库都写在了这里 target_link_libraries(${PLUGIN_NAME} PRIVATE - ${Qt5Widgets_LIBRARIES} - ${DtkWidget_LIBRARIES} - ${DdeControlCenter_LIBRARIES} - ${Qt5DBus_LIBRARIES} ${KF5_QT_LIBRARIES} - ${Qt5Network_LIBRARIES} - ${DCC_WIDGETS_LIBRARIES} - ${DCC_INTERFACE_LIBRARIES} + Dtk::Widget + Qt5::Widgets + Qt5::Network + Qt5::DBus + Dde::DCCWidget + Dde::DCCInterface ${DDE-Network-Core_LIBRARIES} )