From 633a426ebb462e9fe0bafa01ac876b6132db0a8e Mon Sep 17 00:00:00 2001
From: Robert Tari <robert@tari.in>
Date: Wed, 20 Oct 2021 01:09:33 +0200
Subject: Use native CMake GSettings module

---
 cmake/UseGSettings.cmake | 23 -----------------------
 data/CMakeLists.txt      |  7 ++++---
 2 files changed, 4 insertions(+), 26 deletions(-)
 delete mode 100644 cmake/UseGSettings.cmake

diff --git a/cmake/UseGSettings.cmake b/cmake/UseGSettings.cmake
deleted file mode 100644
index 3b61523..0000000
--- a/cmake/UseGSettings.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
-
-macro(add_schema SCHEMA_NAME)
-
-    set(PKG_CONFIG_EXECUTABLE pkg-config)
-    set(GSETTINGS_DIR "${CMAKE_INSTALL_FULL_DATAROOTDIR}/glib-2.0/schemas")
-
-    # Run the validator and error if it fails
-    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_compile_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
-    execute_process (COMMAND ${_glib_compile_schemas} --dry-run --schema-file=${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-    if (_schemas_invalid)
-      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
-    endif (_schemas_invalid)
-
-    # Actually install and recomple schemas
-    message (STATUS "${GSETTINGS_DIR} is the GSettings install dir")
-    install (FILES ${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
-
-    install (CODE "message (STATUS \"Compiling GSettings schemas\")")
-    install (CODE "execute_process (COMMAND ${_glib_compile_schemas} ${GSETTINGS_DIR})")
-endmacro()
-
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index 8e3926d..55368ed 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,6 @@
 ##  GSettings schema
 ##
 
-include (UseGSettings)
 set (SCHEMA_NAME "org.ayatana.indicator.notifications.gschema.xml")
 set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}")
 set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in")
@@ -11,8 +10,10 @@ set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.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
-- 
cgit v1.2.3