aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:14:44 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:14:44 +0200
commit125095daa1a9ae386523627e04766a11abffbeb4 (patch)
tree18435f04203c9228ae4831a013e6bfda01a37c20
parente0262a63e16616235a067e479b0f3550f36a22c5 (diff)
parent001010d8b5f8dbdf7b4fe57393470f945afef37b (diff)
downloadlibayatana-common-125095daa1a9ae386523627e04766a11abffbeb4.tar.gz
libayatana-common-125095daa1a9ae386523627e04766a11abffbeb4.tar.bz2
libayatana-common-125095daa1a9ae386523627e04766a11abffbeb4.zip
Merge branch 'tari01-pr/use-intltool-merge-translations'
Attributes GH PR #48: https://github.com/AyatanaIndicators/libayatana-common/pull/48
-rw-r--r--data/CMakeLists.txt5
1 files changed, 3 insertions, 2 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index a8e56ab..317f39d 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -1,8 +1,9 @@
# org.ayatana.common.gschema.xml
-find_package(GSettings)
+find_package(Intltool REQUIRED)
set(ENV{LC_ALL} "C")
-execute_process(COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.common.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.common.gschema.xml")
+intltool_merge_translations("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.common.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.common.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS)
+find_package(GSettings REQUIRED)
set(GSETTINGS_COMPILE ON)
add_schema("org.ayatana.common.gschema.xml")