gnucash unstable: Revert "Add COMPILE_SCHEMA to allow disabling gschema compilation"

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/85ec07ec (commit)
	from  https://github.com/Gnucash/gnucash/commit/25d9431d (commit)



commit 85ec07ec309bfc3243b879b8c4b624a856449310
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat Mar 17 14:56:37 2018 -0700

    Revert "Add COMPILE_SCHEMA to allow disabling gschema compilation"
    
    This reverts commit 6b46299e8dd78cd0202c0c75f6a27d885ca931df, which was
    pushed by mistake.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4bd2e9f..370a6d1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -71,9 +71,6 @@ OPTION (ALLOW_OLD_GETTEXT "allow to configure build with a gettext version older
 
 # These are also settable from the command line in a similar way.
 
-# Use gsettings-desktop-schema for a better integration with GNOME
-SET(COMPILE_SCHEMA ON CACHE BOOL "Compile the GSettings schema")
-
 SET(GNUCASH_BUILD_ID "" CACHE STRING "Overrides the GnuCash build identification (Build ID) which defaults to a description of the vcs commit from which gnucash is built. Distributions may want to insert a package management based version number instead")
 # GENERATE_SWIG_WRAPPERS - Controls whether to generate the swig wrappers for guile and python. If not set the wrappers will only be generated when building from a git worktree, commented out here, but will be evaluated later on in this file
 
diff --git a/gnucash/gschemas/CMakeLists.txt b/gnucash/gschemas/CMakeLists.txt
index b7668f1..9f68bb7 100644
--- a/gnucash/gschemas/CMakeLists.txt
+++ b/gnucash/gschemas/CMakeLists.txt
@@ -22,25 +22,23 @@ SET(gschema_SOURCES
 add_gschema_targets("${gschema_SOURCES}")
 
 # Handle gschemas.compiled
-if (COMPILE_SCHEMA)
-    set(CMAKE_COMMAND_TMP "")
-    if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-        set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-    endif()
-
-    add_custom_command(
-        OUTPUT ${SCHEMADIR_BUILD}/gschemas.compiled
-        COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR_BUILD}
-        DEPENDS ${gschema_depends}
-    )
+set(CMAKE_COMMAND_TMP "")
+if (${CMAKE_VERSION} VERSION_GREATER 3.1)
+    set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+endif()
+
+add_custom_command(
+    OUTPUT ${SCHEMADIR_BUILD}/gschemas.compiled
+    COMMAND ${CMAKE_COMMAND_TMP} ${GLIB_COMPILE_SCHEMAS} ${SCHEMADIR_BUILD}
+    DEPENDS ${gschema_depends}
+)
 
-    add_custom_target(compiled-schemas ALL DEPENDS ${SCHEMADIR_BUILD}/gschemas.compiled)
+add_custom_target(compiled-schemas ALL DEPENDS ${SCHEMADIR_BUILD}/gschemas.compiled)
 
 
-    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\")")
-endif ()
+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:
 CMakeLists.txt                  |  3 ---
 gnucash/gschemas/CMakeLists.txt | 30 ++++++++++++++----------------
 2 files changed, 14 insertions(+), 19 deletions(-)