aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:01:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:01:53 +0200
commit31defa19689dba0eb1a59041441656198d610122 (patch)
treebec96e721ecdac1ec1fc3d3a5bd77770decac350 /data
parent8cae720697d84061f1b6bac0e3729d96731bc65d (diff)
parentcb4dc747aa5a6f978101132b54b3572c07642cfd (diff)
downloadayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.tar.gz
ayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.tar.bz2
ayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.zip
Merge branch 'tari01-pr/use-native-cmake-gsettings-module'
Attributes GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/41
Diffstat (limited to 'data')
-rw-r--r--data/CMakeLists.txt7
1 files changed, 4 insertions, 3 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 2b8ab36..e51a2f1 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,7 @@
## GSettings schema
##
-include (UseGSettings)
+find_package(GSettings)
set (SCHEMA_NAME "org.ayatana.indicator.power.gschema.xml")
set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
@@ -11,8 +11,9 @@ set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
set (ENV{LC_ALL} "C")
execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}")
-# let UseGSettings do the rest
-add_schema (${SCHEMA_FILE})
+# let GSettings do the rest
+set(GSETTINGS_COMPILE ON)
+add_schema (${SCHEMA_NAME})
##
## Systemd Unit File