aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:01:53 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-21 11:01:53 +0200
commit31defa19689dba0eb1a59041441656198d610122 (patch)
treebec96e721ecdac1ec1fc3d3a5bd77770decac350
parent8cae720697d84061f1b6bac0e3729d96731bc65d (diff)
parentcb4dc747aa5a6f978101132b54b3572c07642cfd (diff)
downloadayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.tar.gz
ayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.tar.bz2
ayatana-indicator-power-31defa19689dba0eb1a59041441656198d610122.zip
Merge branch 'tari01-pr/use-native-cmake-gsettings-module'
Attributes GH PR #41: https://github.com/AyatanaIndicators/ayatana-indicator-power/pull/41
-rw-r--r--cmake/UseGSettings.cmake23
-rw-r--r--data/CMakeLists.txt7
2 files changed, 4 insertions, 26 deletions
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 2b8ab36..e51a2f1 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -2,7 +2,7 @@
## GSettings schema
##
-include (UseGSettings)
+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")
@@ -11,8 +11,9 @@ 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
+set(GSETTINGS_COMPILE ON)
+add_schema (${SCHEMA_NAME})
##
## Systemd Unit File