From 3f4ff0d292875532f6de14c9861849102282ae40 Mon Sep 17 00:00:00 2001 From: donghualin Date: Tue, 27 Sep 2022 02:58:33 +0000 Subject: [PATCH] =?UTF-8?q?style:=20=E4=BC=98=E5=8C=96CMakeList.txt?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CMakeList.txt文件中从GLOB改成GLOB_RECURSE，删除重复的包含 Log: 优化CMakeList.txt文件 Influence: 无 Task: https://pms.uniontech.com/task-view-96831.html Change-Id: I2ca603eed4704f2d2c6eb87a027836e768084c7f --- frame/CMakeLists.txt | 11 +---------- plugins/airplane-mode/CMakeLists.txt | 2 -- plugins/bluetooth/CMakeLists.txt | 2 -- plugins/datetime/CMakeLists.txt | 2 -- plugins/keyboard-layout/CMakeLists.txt | 6 +----- plugins/onboard/CMakeLists.txt | 2 -- plugins/power/CMakeLists.txt | 2 -- plugins/sound/CMakeLists.txt | 2 -- plugins/trash/CMakeLists.txt | 4 +--- plugins/tray/CMakeLists.txt | 4 ---- 10 files changed, 3 insertions(+), 34 deletions(-) diff --git a/frame/CMakeLists.txt b/frame/CMakeLists.txt index 456d0f599..b78048e9b 100644 --- a/frame/CMakeLists.txt +++ b/frame/CMakeLists.txt @@ -12,16 +12,7 @@ endif() generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/generation_dbus_interface) # Sources files -file(GLOB_RECURSE SRCS "*.h" - "*.cpp" - "../widgets/*.h" - "../widgets/*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" - "./qtdbusextended/*.h" - "./qtdbusextended/*.cpp" - "./dbusinterface/types/*.h" - "./dbusinterface/types/*.cpp") +file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../widgets/*.h" "../widgets/*.cpp") # Find the library find_package(PkgConfig REQUIRED) diff --git a/plugins/airplane-mode/CMakeLists.txt b/plugins/airplane-mode/CMakeLists.txt index 5a8bab952..b28736de2 100644 --- a/plugins/airplane-mode/CMakeLists.txt +++ b/plugins/airplane-mode/CMakeLists.txt @@ -12,8 +12,6 @@ file(GLOB_RECURSE SRCS "*.h" "../../widgets/*.cpp" "../../frame/util/imageutil.h" "../../frame/util/imageutil.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/bluetooth/CMakeLists.txt b/plugins/bluetooth/CMakeLists.txt index 3072dd5c2..ffe049b77 100644 --- a/plugins/bluetooth/CMakeLists.txt +++ b/plugins/bluetooth/CMakeLists.txt @@ -16,8 +16,6 @@ file(GLOB_RECURSE SRCS "*.h" "../../frame/util/statebutton.cpp" "../../frame/util/horizontalseperator.h" "../../frame/util/horizontalseperator.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/datetime/CMakeLists.txt b/plugins/datetime/CMakeLists.txt index a21a92061..a4962985f 100644 --- a/plugins/datetime/CMakeLists.txt +++ b/plugins/datetime/CMakeLists.txt @@ -10,8 +10,6 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" - "./dbusinterface/*.h" - "./dbusinterface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp" "") diff --git a/plugins/keyboard-layout/CMakeLists.txt b/plugins/keyboard-layout/CMakeLists.txt index 76ed7434f..376574684 100644 --- a/plugins/keyboard-layout/CMakeLists.txt +++ b/plugins/keyboard-layout/CMakeLists.txt @@ -8,12 +8,8 @@ generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_ # Sources files file(GLOB_RECURSE SRCS "*.h" "*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" - "../../frame/qtdbusextended/*.cpp" - "./dbusinterface/types/*.h" - "./dbusinterface/types/*.cpp") + "../../frame/qtdbusextended/*.cpp") find_package(PkgConfig REQUIRED) find_package(Qt5Widgets REQUIRED) diff --git a/plugins/onboard/CMakeLists.txt b/plugins/onboard/CMakeLists.txt index aa3d2eff3..54eca840a 100644 --- a/plugins/onboard/CMakeLists.txt +++ b/plugins/onboard/CMakeLists.txt @@ -10,8 +10,6 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/power/CMakeLists.txt b/plugins/power/CMakeLists.txt index 1cd9e364f..b68a5a83e 100644 --- a/plugins/power/CMakeLists.txt +++ b/plugins/power/CMakeLists.txt @@ -10,8 +10,6 @@ file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/sound/CMakeLists.txt b/plugins/sound/CMakeLists.txt index f101dc90e..1e677d8db 100644 --- a/plugins/sound/CMakeLists.txt +++ b/plugins/sound/CMakeLists.txt @@ -14,8 +14,6 @@ file(GLOB_RECURSE SRCS "*.h" "../../frame/util/imageutil.cpp" "../../frame/util/horizontalseperator.h" "../../frame/util/horizontalseperator.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/trash/CMakeLists.txt b/plugins/trash/CMakeLists.txt index a08f4c468..c8c07da2b 100644 --- a/plugins/trash/CMakeLists.txt +++ b/plugins/trash/CMakeLists.txt @@ -6,12 +6,10 @@ project(${PLUGIN_NAME}) generation_dbus_interface(${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/xml ${CMAKE_CURRENT_SOURCE_DIR}/dbusinterface/generation_dbus_interface) # Sources files -file(GLOB SRCS "*.h" +file(GLOB_RECURSE SRCS "*.h" "*.cpp" "../../widgets/*.h" "../../widgets/*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp") diff --git a/plugins/tray/CMakeLists.txt b/plugins/tray/CMakeLists.txt index e9ba79466..018b86e93 100644 --- a/plugins/tray/CMakeLists.txt +++ b/plugins/tray/CMakeLists.txt @@ -38,10 +38,6 @@ file(GLOB_RECURSE SRCS "*.h" "../../frame/controller/proxyplugincontroller.cpp" "../../frame/qtdbusextended/*.h" "../../frame/qtdbusextended/*.cpp" - "./dbusinterface/generation_dbus_interface/*.h" - "./dbusinterface/generation_dbus_interface/*.cpp" - "./dbusinterface/types/*.h" - "./dbusinterface/types/*.cpp" ) find_package(PkgConfig REQUIRED)