From e49c123a61604ec14a38bde27995585c6ae6e673 Mon Sep 17 00:00:00 2001 From: liuxinhao Date: Fri, 11 Aug 2023 09:56:14 +0800 Subject: [PATCH] fix(gsettings): screensaver-locker paths use the cmake macro MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 修改screensaver-locker的插件路径为使用cmake宏 Closes #12303 --- CMakeLists.txt | 5 ++++- ...ema.xml => com.kylinsec.kiran.screensaver.gschema.xml.in} | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) rename data/{com.kylinsec.kiran.screensaver.gschema.xml => com.kylinsec.kiran.screensaver.gschema.xml.in} (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb60b39..aeab1e4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,4 +120,7 @@ install(FILES ${DEVEL_HEADER} DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTAL #install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.Kiran.ScreenSaver.service DESTINATION ${DBUS_SERVICE_INSTALL_DIR}) install(FILES data/kiran-screensaver.desktop DESTINATION ${XDG_AUTO_START_DIR}) install(FILES data/kiran-screensaver DESTINATION /${CMAKE_INSTALL_SYSCONFDIR}/pam.d/) -install(FILES data/com.kylinsec.kiran.screensaver.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/) + +set(SCREENSAVER_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}/kiran-screensaver) +configure_file(data/com.kylinsec.kiran.screensaver.gschema.xml.in ${CMAKE_BINARY_DIR}/com.kylinsec.kiran.screensaver.gschema.xml ) +install(FILES ${CMAKE_BINARY_DIR}/com.kylinsec.kiran.screensaver.gschema.xml DESTINATION ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/) \ No newline at end of file diff --git a/data/com.kylinsec.kiran.screensaver.gschema.xml b/data/com.kylinsec.kiran.screensaver.gschema.xml.in similarity index 90% rename from data/com.kylinsec.kiran.screensaver.gschema.xml rename to data/com.kylinsec.kiran.screensaver.gschema.xml.in index 17b6f20..d364f17 100644 --- a/data/com.kylinsec.kiran.screensaver.gschema.xml +++ b/data/com.kylinsec.kiran.screensaver.gschema.xml.in @@ -2,7 +2,7 @@ - "/usr/lib64/kiran-screensaver/libkiran-screensaver-dialog.so" + "@SCREENSAVER_PLUGIN_DIR@/libkiran-screensaver-dialog.so" -- 2.33.0