From 9e60447a4d57a9bdeeb15cc41dd966bc86bf6eab Mon Sep 17 00:00:00 2001 From: donghualin Date: Wed, 2 Nov 2022 05:29:15 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除CMakeLists.txt中多余的包含文件，防止编译的时候找不到对应的包引起报错或者警告 Log: 消除编译警告 Influence: 无 Task: https://pms.uniontech.com/task-view-96831.html Change-Id: I0b432916718ef1d3e46b6840513640ab9007982a --- plugins/airplane-mode/CMakeLists.txt | 4 ++-- plugins/bluetooth/CMakeLists.txt | 4 ++-- plugins/multitasking/CMakeLists.txt | 2 +- plugins/onboard/CMakeLists.txt | 4 ++-- plugins/overlay-warning/CMakeLists.txt | 2 +- plugins/power/CMakeLists.txt | 4 ++-- plugins/show-desktop/CMakeLists.txt | 2 +- plugins/shutdown/CMakeLists.txt | 5 +++-- plugins/trash/CMakeLists.txt | 4 ++-- 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/plugins/airplane-mode/CMakeLists.txt b/plugins/airplane-mode/CMakeLists.txt index 3d6d8ee4f..fa4b51fc5 100644 --- a/plugins/airplane-mode/CMakeLists.txt +++ b/plugins/airplane-mode/CMakeLists.txt @@ -8,8 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "../../widgets/*.h" - "../../widgets/*.cpp" + "../../widgets/tipswidget.h" + "../../widgets/tipswidget.cpp" "../../frame/util/imageutil.h" "../../frame/util/imageutil.cpp" "../../frame/qtdbusextended/*.h" diff --git a/plugins/bluetooth/CMakeLists.txt b/plugins/bluetooth/CMakeLists.txt index 78185f0d2..5cd2a03ec 100644 --- a/plugins/bluetooth/CMakeLists.txt +++ b/plugins/bluetooth/CMakeLists.txt @@ -8,8 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "../../widgets/*.h" - "../../widgets/*.cpp" + "../../widgets/tipswidget.h" + "../../widgets/tipswidget.cpp" "../../frame/util/imageutil.h" "../../frame/util/imageutil.cpp" "../../frame/util/statebutton.h" diff --git a/plugins/multitasking/CMakeLists.txt b/plugins/multitasking/CMakeLists.txt index 618ddcd0f..1c44ec04f 100644 --- a/plugins/multitasking/CMakeLists.txt +++ b/plugins/multitasking/CMakeLists.txt @@ -4,7 +4,7 @@ set(PLUGIN_NAME "multitasking") project(${PLUGIN_NAME}) # Sources files -file(GLOB SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp") +file(GLOB SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) diff --git a/plugins/onboard/CMakeLists.txt b/plugins/onboard/CMakeLists.txt index 54eca840a..11df5e04f 100644 --- a/plugins/onboard/CMakeLists.txt +++ b/plugins/onboard/CMakeLists.txt @@ -8,8 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "../../widgets/*.h" - "../../widgets/*.cpp" + "../../widgets/tipswidget.h" + "../../widgets/tipswidget.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/overlay-warning/CMakeLists.txt b/plugins/overlay-warning/CMakeLists.txt index 3a07bf4b2..6041f163e 100644 --- a/plugins/overlay-warning/CMakeLists.txt +++ b/plugins/overlay-warning/CMakeLists.txt @@ -4,7 +4,7 @@ set(PLUGIN_NAME "overlay-warning") project(${PLUGIN_NAME}) # Sources files -file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp") +file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) diff --git a/plugins/power/CMakeLists.txt b/plugins/power/CMakeLists.txt index b68a5a83e..3016ac120 100644 --- a/plugins/power/CMakeLists.txt +++ b/plugins/power/CMakeLists.txt @@ -8,8 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "../../widgets/*.h" - "../../widgets/*.cpp" + "../../widgets/tipswidget.h" + "../../widgets/tipswidget.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/show-desktop/CMakeLists.txt b/plugins/show-desktop/CMakeLists.txt index d98d5b724..42e4c412a 100644 --- a/plugins/show-desktop/CMakeLists.txt +++ b/plugins/show-desktop/CMakeLists.txt @@ -4,7 +4,7 @@ set(PLUGIN_NAME "show-desktop") project(${PLUGIN_NAME}) # Sources files -file(GLOB SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp") +file(GLOB SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) diff --git a/plugins/shutdown/CMakeLists.txt b/plugins/shutdown/CMakeLists.txt index 2f123a3a8..3e436561d 100644 --- a/plugins/shutdown/CMakeLists.txt +++ b/plugins/shutdown/CMakeLists.txt @@ -4,7 +4,7 @@ set(PLUGIN_NAME "shutdown") project(${PLUGIN_NAME}) # Sources files -file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp") +file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/tipswidget.h" "../../widgets/tipswidget.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) @@ -23,7 +23,8 @@ set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../) target_include_directories(${PLUGIN_NAME} PUBLIC ${DtkWidget_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${QGSettings_INCLUDE_DIRS} - ../../interfaces) + ../../interfaces + ../../widgets) target_link_libraries(${PLUGIN_NAME} PRIVATE ${DtkWidget_LIBRARIES} ${Qt5Widgets_LIBRARIES} diff --git a/plugins/trash/CMakeLists.txt b/plugins/trash/CMakeLists.txt index c8c07da2b..1518c610e 100644 --- a/plugins/trash/CMakeLists.txt +++ b/plugins/trash/CMakeLists.txt @@ -8,8 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "../../widgets/*.h" - "../../widgets/*.cpp" + "../../widgets/tipswidget.h" + "../../widgets/tipswidget.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp")