aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 21:27:45 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 21:27:45 +0200
commit29440cf9b6fdaa8184c2d0c82d61b2c86594d1d1 (patch)
tree330d85f6faa1a8c3a3bb3f540244e5b54081983d /data
parent0a26104dcef1a77fb11e4bc8b0659de54caceb99 (diff)
parent4f92dd8d052c80c752ca0df5e9b98f9daa6c2c0d (diff)
downloadayatana-indicator-datetime-29440cf9b6fdaa8184c2d0c82d61b2c86594d1d1.tar.gz
ayatana-indicator-datetime-29440cf9b6fdaa8184c2d0c82d61b2c86594d1d1.tar.bz2
ayatana-indicator-datetime-29440cf9b6fdaa8184c2d0c82d61b2c86594d1d1.zip
Merge branch 'tari01-pr/use-native-cmake-gsettings-module'
Attributes GH PR 57: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/57
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 d7ab10f..c76da5f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,6 @@
## GSettings schema
##
-include (UseGSettings)
set (SCHEMA_NAME "org.ayatana.indicator.datetime.gschema.xml")
set (SCHEMA_FILE_IN_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in.in")
set (SCHEMA_FILE_IN "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}.in")
@@ -13,8 +12,10 @@ configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_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
+find_package(GSettings REQUIRED)
+set(GSETTINGS_COMPILE ON)
+add_schema (${SCHEMA_NAME})
##
## Systemd Unit File