From eec442b9de799ca1c955f460537157b7a5c69b89 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Mon, 26 Mar 2018 15:58:52 +0200 Subject: [PATCH] generate .gschema.xml.in to include cmake constants e.g. alarm_default_sound --- data/CMakeLists.txt | 16 +++++++++++++--- ...ayatana.indicator.datetime.gschema.xml.in.in} | 2 +- 2 files changed, 14 insertions(+), 4 deletions(-) rename data/{org.ayatana.indicator.datetime.gschema.xml => org.ayatana.indicator.datetime.gschema.xml.in.in} (98%) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index bd03e9d1..f158346d 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -2,9 +2,19 @@ ## GSettings schema ## -find_package (GSettings) - -add_schema ("org.ayatana.indicator.datetime.gschema.xml") +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") +set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") +# generate the .xml.in file so cmake constants are included +configure_file(${SCHEMA_FILE_IN_IN} ${SCHEMA_FILE_IN}) +# generate the .xml file using intltool +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}) ## ## Systemd Unit File diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml.in.in similarity index 98% rename from data/org.ayatana.indicator.datetime.gschema.xml rename to data/org.ayatana.indicator.datetime.gschema.xml.in.in index 86facab8..0af3f1b7 100644 --- a/data/org.ayatana.indicator.datetime.gschema.xml +++ b/data/org.ayatana.indicator.datetime.gschema.xml.in.in @@ -132,7 +132,7 @@ - '/usr/share/sounds/ubuntu/ringtones/Alarm clock.ogg' + '${ALARM_DEFAULT_SOUND}' The alarm's default sound file. If an alarm doesn't specify its own sound file, this file will be used as the fallback sound.