aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 21:35:58 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 21:35:58 +0200
commit72f7e021c7c0a523c6e217723db854ee4b4dd375 (patch)
tree4101fc303085df116c498b5e741ba4bab1a9ae2c
parent1b5c19842582032f841a6f27c592a4ea1256994d (diff)
parent1f84bc4cecaa4f242f978e56d85a904dc0c850c7 (diff)
downloadayatana-indicator-session-72f7e021c7c0a523c6e217723db854ee4b4dd375.tar.gz
ayatana-indicator-session-72f7e021c7c0a523c6e217723db854ee4b4dd375.tar.bz2
ayatana-indicator-session-72f7e021c7c0a523c6e217723db854ee4b4dd375.zip
Merge branch 'tari01-pr/use-intltool-merge-translations'
Attributes GH PR #59: https://github.com/AyatanaIndicators/ayatana-indicator-session/pull/59
-rw-r--r--data/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index b0b87ff..707d414 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,5 +1,3 @@
-find_package(GSettings)
-
##
## GSettings schema
##
@@ -9,10 +7,12 @@ set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
# generate the .xml file using intltool
+find_package(Intltool REQUIRED)
set (ENV{LC_ALL} "C")
-execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}")
+intltool_merge_translations("${SCHEMA_FILE_IN}" "${SCHEMA_FILE}" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
# let GSettings do the rest
+find_package(GSettings REQUIRED)
set(GSETTINGS_COMPILE ON)
add_schema (${SCHEMA_NAME})