85 lines
2.7 KiB
Diff
85 lines
2.7 KiB
Diff
From 4b93ca3e5b8eed92c1dfc4468780733ded46a886 Mon Sep 17 00:00:00 2001
|
|
From: luoqing <luoqing@kylinsec.com.cn>
|
|
Date: Mon, 17 Apr 2023 10:20:11 +0800
|
|
Subject: [PATCH 2/2] feature(options.cmake):Add compilation option switch,
|
|
whether to enable network, volume, and user group plugins
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 增加编译选项开关，是否开启网络、音量和用户组插件
|
|
---
|
|
CMakeLists.txt | 1 +
|
|
kcp_variables.cmake | 1 -
|
|
options.cmake | 3 +++
|
|
plugins/CMakeLists.txt | 10 ++++++++--
|
|
4 files changed, 12 insertions(+), 3 deletions(-)
|
|
create mode 100644 options.cmake
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index d053430..a437b57 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -33,6 +33,7 @@ pkg_search_module(QGSETTINGS REQUIRED gsettings-qt)
|
|
|
|
include(kcp_variables.cmake)
|
|
include(kcp-qdbus-wrapper.cmake)
|
|
+include(options.cmake)
|
|
|
|
configure_file(${CMAKE_SOURCE_DIR}/data/config.h.in ${CMAKE_BINARY_DIR}/config.h)
|
|
configure_file(${CMAKE_SOURCE_DIR}/data/${PROJECT_NAME}.desktop.in ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.desktop)
|
|
diff --git a/kcp_variables.cmake b/kcp_variables.cmake
|
|
index 0709a11..ae01d40 100644
|
|
--- a/kcp_variables.cmake
|
|
+++ b/kcp_variables.cmake
|
|
@@ -10,7 +10,6 @@ set(KCP_INSTALL_INCLUDE ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}/${PR
|
|
set(SYSCONFDIR "/etc" CACHE PATH "Installation directory for configurations")
|
|
|
|
set(KCP_PLUGIN_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
|
|
-OPTION(ENABLE_USER_GROUP "Enable user group" OFF)
|
|
|
|
#根级分类安装路径
|
|
set(CATEGORY_INSTALL_DIR ${INSTALL_DATADIR}/${PROJECT_NAME}/category)
|
|
diff --git a/options.cmake b/options.cmake
|
|
new file mode 100644
|
|
index 0000000..1776e21
|
|
--- /dev/null
|
|
+++ b/options.cmake
|
|
@@ -0,0 +1,3 @@
|
|
+OPTION(ENABLE_USER_GROUP "Enable user group" OFF)
|
|
+OPTION(ENABLE_NETWORK "Enable network plugin" ON)
|
|
+OPTION(ENABLE_AUDIO "Enable audio plugin" ON)
|
|
\ No newline at end of file
|
|
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
|
|
index a55e816..c471259 100644
|
|
--- a/plugins/CMakeLists.txt
|
|
+++ b/plugins/CMakeLists.txt
|
|
@@ -3,16 +3,22 @@ cmake_minimum_required(VERSION 3.2)
|
|
add_subdirectory(system)
|
|
add_subdirectory(power)
|
|
add_subdirectory(mouse)
|
|
-add_subdirectory(audio)
|
|
# add_subdirectory(greeter)
|
|
add_subdirectory(account)
|
|
add_subdirectory(keyboard)
|
|
add_subdirectory(timedate)
|
|
-add_subdirectory(network)
|
|
add_subdirectory(display)
|
|
add_subdirectory(keybinding)
|
|
add_subdirectory(appearance)
|
|
add_subdirectory(authentication)
|
|
+if(ENABLE_NETWORK)
|
|
+ add_subdirectory(network)
|
|
+endif()
|
|
+
|
|
+if(ENABLE_AUDIO)
|
|
+ add_subdirectory(audio)
|
|
+endif()
|
|
+
|
|
if(ENABLE_USER_GROUP)
|
|
add_subdirectory(group)
|
|
endif()
|
|
--
|
|
2.33.0
|
|
|