gnucash unstable: Remove the need for a temporary script file to compile gschemas

Geert Janssens gjanssens at code.gnucash.org
Sat Feb 17 14:17:29 EST 2018


Updated	 via  https://github.com/Gnucash/gnucash/commit/fbdacae6 (commit)
	from  https://github.com/Gnucash/gnucash/commit/de4b72dc (commit)



commit fbdacae610392e4639161af67cce45b9257101ed
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Feb 17 20:16:11 2018 +0100

    Remove the need for a temporary script file to compile gschemas
    
    I opted for this temporary script to be able to print a message while compiling
    as glib-compile-schemas is totally silent. Turns out printing the message can equally
    be done directly in the install command.

diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index cb8d62a..a4bcc97 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -32,13 +32,9 @@ add_custom_command(
 add_custom_target(compiled-schemas ALL DEPENDS ${SCHEMADIR_BUILD}/gschemas.compiled)
 
 
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/compile_schemas.sh
-"set -e
-echo \"Compiling gschema files in $DESTDIR${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas\"
-${GLIB_COMPILE_SCHEMAS} $DESTDIR${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas")
-
-
-install(CODE "execute_process(COMMAND ${SHELL} ${CMAKE_CURRENT_BINARY_DIR}/compile_schemas.sh)")
+install(CODE "execute_process(
+    COMMAND ${SHELL} -c \"echo Compiling gschema files in $DESTDIR${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas ;
+                          ${GLIB_COMPILE_SCHEMAS} $DESTDIR${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas\")")
 
 SET(gschemas_DIST_local "")
 FOREACH(file ${gschema_SOURCES})



Summary of changes:
 gnucash/gschemas/CMakeLists.txt | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)



More information about the gnucash-changes mailing list