fix(merge-to-v23): 0873866

18202781743 · May 23, 2023 · 5be9677 · 5be9677
1 parent 04b7de0
commit 5be9677
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/dcc-network-plugin/CMakeLists.txt b/dcc-network-plugin/CMakeLists.txt
@@ -55,8 +55,6 @@ add_library(${PLUGIN_NAME} SHARED ${SRCS})
 # 变量 ${DtkWidget_INCLUDE_DIRS} 是在前面执行 find_package 命令时引入的
 # 当出现编译失败提示找不到某些库的头文件时应该检查此处是否将所有需要的头文件都包含了
 target_include_directories(${PLUGIN_NAME} PUBLIC
-    ../src
-    ../src/realize
     window
     operation
     ${Qt5Widgets_INCLUDE_DIRS}
@@ -66,7 +64,7 @@ target_include_directories(${PLUGIN_NAME} PUBLIC
     ${KF5_QT_INCLUDE_DIRS}
     ${Qt5Network_INCLUDE_DIRS}
     ${NETINTERFACEINCLUDE}
-#    ${DDE-Network-Core_INCLUDE_DIRS}
+    ${DDE-Network-Core_INCLUDE_DIRS}
 )
 # 设置目标要使用的链接库
 # 变量 ${DtkWidget_LIBRARIES} 和 ${Qt5Widgets_LIBRARIES} 是在前面执行 find_package 命令时引入的
@@ -80,7 +78,7 @@ target_link_libraries(${PLUGIN_NAME} PRIVATE
     ${Qt5Network_LIBRARIES}
     ${DCC_WIDGETS_LIBRARIES}
     ${DCC_INTERFACE_LIBRARIES}
-#    ${DDE-Network-Core_LIBRARIES}
+    ${DDE-Network-Core_LIBRARIES}
 )
 
 # 设置执行 make install 时哪个目标应该被 install 到哪个位置

diff --git a/dock-network-plugin/CMakeLists.txt b/dock-network-plugin/CMakeLists.txt
@@ -43,7 +43,6 @@ if (NOT KF5_QT_LIBRARIES)
 endif()
 
 target_include_directories(${PLUGIN_NAME} PUBLIC
-    ${NETWORKINTERFACE}
     ${DtkWidget_INCLUDE_DIRS}
     ${Qt5DBus_INCLUDE_DIRS}
     ${QGSettings_INCLUDE_DIRS}

diff --git a/dss-network-plugin/CMakeLists.txt b/dss-network-plugin/CMakeLists.txt
@@ -39,7 +39,6 @@ if (NOT KF5_QT_LIBRARIES)
 endif()
 
 target_include_directories(${PLUGIN_NAME} PUBLIC
-    ${NETWORKINTERFACE}
     ${DtkWidget_INCLUDE_DIRS}
     ${Qt5DBus_INCLUDE_DIRS}
     ${QGSettings_INCLUDE_DIRS}

diff --git a/example/CMakeLists.txt b/example/CMakeLists.txt
@@ -17,8 +17,6 @@ aux_source_directory(../dcc-network-plugin/sections/vpn DCCPLUGINSECTIONSVPN)
 aux_source_directory(../dcc-network-plugin/settings DCCPLUGINSETTINGS)
 aux_source_directory(../dcc-network-plugin/settings/vpn DCCPLUGINVPNSETTINGS)
 aux_source_directory(../dcc-network-plugin/themes DCCPLUGINTHEMES)
-aux_source_directory(../src NETWORKDIR)
-aux_source_directory(../src/realize REALIZEDIR)
 
 file(GLOB_RECURSE QRCFILE "./example.qrc"
     "../dcc-network-plugin/icons/dcc-network-plugin.qrc"
@@ -38,8 +36,6 @@ file(GLOB_RECURSE DCCPLUGINSRCS
     "../dcc-network-plugin/*.h"
     "../dcc-network-plugin/*.cpp"
     "../dcc-network-plugin/icons/*"
-    "../dcc-network-plugin/../src/*.h"
-    "../dcc-network-plugin/../src/*.cpp"
 )
 #message(${DCCPLUGINDIR})
 
@@ -74,8 +70,6 @@ IMPORTED_LOCATION_NOCONFIG
 )
 
 target_include_directories(${PROJECT_NAME} PUBLIC
-    ../src
-    ../src/realize
     ../dcc-network-plugin
     ../dcc-network-plugin/window
     ../dcc-network-plugin/operation
@@ -89,7 +83,8 @@ target_include_directories(${PROJECT_NAME} PUBLIC
     #${LibNM_INCLUDE_DIRS}
     ${Qt5Network_INCLUDE_DIRS}
     ${KF5_QT_INCLUDE_DIRS}
-    ${NETINTERFACEINCLUDE})
+    ${DDE-Network-Core_INCLUDE_DIRS}
+)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
     ${DdeControlCenter_LIBRARIES}
@@ -103,7 +98,9 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     ${Qt5DBus_LIBRARIES}
     ${Qt5Network_LIBRARIES}
     ${QGSettings_LIBRARIES}
-    ${KF5_QT_LIBRARIES})
+    ${KF5_QT_LIBRARIES}
+    ${DDE-Network-Core_LIBRARIES}
+)
 
 add_custom_command(
     OUTPUT path.pb.cc path.pb.h

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -45,10 +45,8 @@ IMPORTED_LOCATION_NOCONFIG
 )
 
 aux_source_directory(. FILES)
-aux_source_directory(../src NETWORKDIR)
-aux_source_directory(../src/realize REALIZEDIR)
 
-add_executable(${PROJECT_NAME} ${FILES} ${NETWORKDIR} ${REALIZEDIR})
+add_executable(${PROJECT_NAME} ${FILES})
 
 target_include_directories(${PROJECT_NAME} PUBLIC
     ${QGSettings_INCLUDE_DIRS}
@@ -71,4 +69,6 @@ target_link_libraries(${PROJECT_NAME} PRIVATE
     ${QGSettings_LIBRARIES}
     ${KF5_QT_LIBRARIES}
     -lpthread
-    -lm)
+    -lm
+    dde-network-core
+)