aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:05:13 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:05:13 +0200
commit89958b62a0bf1f71922f3f3232cd9e17b8b50ea5 (patch)
treed995310c1fb1941f6f053dfbd7aeab4b364d798e
parent31defa19689dba0eb1a59041441656198d610122 (diff)
parent4fde8a36eae6cc88a8ac220cca1a3d09c189501e (diff)
downloadayatana-indicator-power-89958b62a0bf1f71922f3f3232cd9e17b8b50ea5.tar.gz
ayatana-indicator-power-89958b62a0bf1f71922f3f3232cd9e17b8b50ea5.tar.bz2
ayatana-indicator-power-89958b62a0bf1f71922f3f3232cd9e17b8b50ea5.zip
Merge branch 'tari01-pr/use-intltool-merge-translations'
Attributes GH PR #42: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/42
-rw-r--r--data/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index e51a2f1..a3b6f10 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,16 +2,17 @@
## GSettings schema
##
-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")
# 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})