134 lines
5.0 KiB
Diff
134 lines
5.0 KiB
Diff
From eaa890cd01b3e3e5c85237f553d7fb738789d713 Mon Sep 17 00:00:00 2001
|
|
From: wangyucheng <wangyucheng@kylinsec.com.cn>
|
|
Date: Fri, 21 Apr 2023 17:23:46 +0800
|
|
Subject: [PATCH] fix(cmake): qt5 cmake command compatible
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
- 兼容qt5 cmake命令的兼容修改
|
|
---
|
|
src/daemon/CMakeLists.txt | 16 ++++++++--------
|
|
src/pam/CMakeLists.txt | 8 ++++----
|
|
2 files changed, 12 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/src/daemon/CMakeLists.txt b/src/daemon/CMakeLists.txt
|
|
index 2bf4984..e6166ec 100644
|
|
--- a/src/daemon/CMakeLists.txt
|
|
+++ b/src/daemon/CMakeLists.txt
|
|
@@ -1,7 +1,7 @@
|
|
file(GLOB_RECURSE DAEMON_H_FILES ./*.h)
|
|
file(GLOB_RECURSE DAEMON_CPP_FILES ./*.cpp)
|
|
|
|
-qt_add_dbus_adaptor(
|
|
+qt5_add_dbus_adaptor(
|
|
AUTH_MANAGER_ADAPTOR_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml
|
|
${CMAKE_SOURCE_DIR}/src/daemon/auth-manager.h
|
|
@@ -9,7 +9,7 @@ qt_add_dbus_adaptor(
|
|
auth_manager_adaptor
|
|
AuthManagerAdaptor)
|
|
|
|
-qt_add_dbus_adaptor(
|
|
+qt5_add_dbus_adaptor(
|
|
AUTH_SESSION_ADAPTOR_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml
|
|
${CMAKE_SOURCE_DIR}/src/daemon/session.h
|
|
@@ -17,7 +17,7 @@ qt_add_dbus_adaptor(
|
|
session_adaptor
|
|
SessionAdaptor)
|
|
|
|
-qt_add_dbus_adaptor(
|
|
+qt5_add_dbus_adaptor(
|
|
USER_ADAPTOR_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml
|
|
${CMAKE_SOURCE_DIR}/src/daemon/user.h Kiran::User user_adaptor UserAdaptor)
|
|
@@ -26,7 +26,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.xml
|
|
PROPERTIES CLASSNAME AccountsProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
ACCOUNTS_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.xml
|
|
accounts_proxy)
|
|
@@ -35,7 +35,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.User.xml
|
|
PROPERTIES CLASSNAME AccountsUserProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
ACCOUNTS_USER_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.SystemDaemon.Accounts.User.xml
|
|
accounts_user_proxy)
|
|
@@ -44,7 +44,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml
|
|
PROPERTIES CLASSNAME AuthDeviceManagerProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
BIOMETRICS_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.xml auth_device_manager_proxy)
|
|
|
|
@@ -52,7 +52,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml
|
|
PROPERTIES CLASSNAME AuthDeviceProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
BIOMETRICS_DEVICE_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.AuthDevice.Device.xml
|
|
auth_device_proxy)
|
|
@@ -62,7 +62,7 @@ set(TARGET_NAME kiran-authentication-daemon)
|
|
configure_file(config-daemon.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-daemon.h)
|
|
|
|
file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts")
|
|
-qt_create_translation(DAEMON_QM_FILES
|
|
+qt5_create_translation(DAEMON_QM_FILES
|
|
${CMAKE_CURRENT_SOURCE_DIR} ../utils
|
|
${TS_FILES}
|
|
OPTIONS -I ${PROJECT_SOURCE_DIR} -I ${PROJECT_BINARY_DIR} -no-obsolete)
|
|
diff --git a/src/pam/CMakeLists.txt b/src/pam/CMakeLists.txt
|
|
index 8a89321..334f33a 100644
|
|
--- a/src/pam/CMakeLists.txt
|
|
+++ b/src/pam/CMakeLists.txt
|
|
@@ -5,7 +5,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml
|
|
PROPERTIES CLASSNAME AuthManagerProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
AUTH_MANAGER_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.xml
|
|
auth_manager_proxy)
|
|
@@ -14,7 +14,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml
|
|
PROPERTIES CLASSNAME AuthSessionProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
AUTH_SESSION_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.Session.xml
|
|
auth_session_proxy)
|
|
@@ -23,7 +23,7 @@ set_source_files_properties(
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml
|
|
PROPERTIES CLASSNAME AuthUserProxy NO_NAMESPACE true)
|
|
|
|
-qt_add_dbus_interface(
|
|
+qt5_add_dbus_interface(
|
|
AUTH_USER_INTERFACE_SRCS
|
|
${CMAKE_SOURCE_DIR}/data/com.kylinsec.Kiran.Authentication.User.xml
|
|
auth_user_proxy)
|
|
@@ -33,7 +33,7 @@ set(TARGET_NAME pam_kiran_authentication)
|
|
configure_file(config-pam.h.in ${CMAKE_CURRENT_BINARY_DIR}/config-pam.h)
|
|
|
|
file(GLOB TS_FILES "${PROJECT_SOURCE_DIR}/translations/${TARGET_NAME}.*.ts")
|
|
-qt_create_translation(PAM_QM_FILES
|
|
+qt5_create_translation(PAM_QM_FILES
|
|
${CMAKE_CURRENT_SOURCE_DIR} ../utils
|
|
${TS_FILES}
|
|
OPTIONS -I ${PROJECT_SOURCE_DIR} -I ${PROJECT_BINARY_DIR} -no-obsolete)
|
|
--
|
|
2.33.0
|
|
|