gnucash maint: Bug 790620 - Failed to create file “/usr/share/glib-2.0/schemas/gschemas.compiled.XY789Y”

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/0d8112bf (commit)
	from  https://github.com/Gnucash/gnucash/commit/1674eb0b (commit)



commit 0d8112bfefdcd13134d6a70042d48806b59475f9
Author: Rob Gowin <robgowin at gmail.com>
Date:   Thu Nov 23 10:50:16 2017 -0500

    Bug 790620 - Failed to create file “/usr/share/glib-2.0/schemas/gschemas.compiled.XY789Y”
    
    Changed install rule for gschema.compiled to use a target.

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a8651da..089a8ba 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -1,7 +1,5 @@
 # Post install actions go here.
 
-INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${GLIB_COMPILE_SCHEMAS} ${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas)")
-
 IF (APPLE)
   INSTALL(CODE "EXECUTE_PROCESS(
                 COMMAND /usr/bin/install_name_tool -add_rpath ${CMAKE_INSTALL_PREFIX}/lib
@@ -16,19 +14,25 @@ IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
 ENDIF()
 
 SET(schema-targets business-gnome-gschema csv-exp-gschema csv-imp-gschema
-    generic-import-gschema gnome-gschema gnome-utils-gschema ofx-gschema qif-imp-gschema)
+    generic-import-gschema gnome-gschema gnome-utils-gschema qif-imp-gschema)
 
 IF (WITH_AQBANKING)
   LIST(APPEND schema-targets aqb-gschema)
 ENDIF (WITH_AQBANKING)
     
-SET(SCHEMA_DIRECTORY ${DATADIR_BUILD}/glib-2.0/schemas)
+IF (WITH_OFX)
+  LIST(APPEND schema-targets ofx-gschema)
+ENDIF (WITH_OFX)
+    
+SET(SCHEMA_BUILD_DIR ${DATADIR_BUILD}/glib-2.0/schemas)
 ADD_CUSTOM_COMMAND(
-  OUTPUT ${SCHEMA_DIRECTORY}/gschemas.compiled
-  COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMA_DIRECTORY}
+  OUTPUT ${SCHEMA_BUILD_DIR}/gschemas.compiled
+  COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMA_BUILD_DIR}
   DEPENDS ${schema-targets}
 )
 
-ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_DIRECTORY}/gschemas.compiled)
+ADD_CUSTOM_TARGET(compiled-schemas ALL DEPENDS ${SCHEMA_BUILD_DIR}/gschemas.compiled)
+
+INSTALL(FILES ${SCHEMA_BUILD_DIR}/gschemas.compiled DESTINATION ${DATADIR}/glib-2.0/schemas)
 
 SET_DIST_LIST(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)



Summary of changes:
 cmake/CMakeLists.txt | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)