Merge branch 'maint' into master

Handle conflict between version number reset and lowercasing all commands

bindings/CMakeLists.txt

@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(python)
+add_subdirectory(python)
 
-SET_LOCAL_DIST(bindings_DIST_local CMakeLists.txt )
+set_local_dist(bindings_DIST_local CMakeLists.txt )
-SET(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)
+set(bindings_DIST ${bindings_DIST_local} ${python_bindings_DIST} PARENT_SCOPE)

bindings/python/CMakeLists.txt

@@ -1,7 +1,7 @@
-ADD_SUBDIRECTORY(example_scripts)
+add_subdirectory(example_scripts)
-ADD_SUBDIRECTORY(tests)
+add_subdirectory(tests)
 
-SET(PYEXEC_FILES  __init__.py function_class.py gnucash_business.py gnucash_core.py)
+set(PYEXEC_FILES  __init__.py function_class.py gnucash_business.py gnucash_core.py)
 
 set(SWIG_FILES ${CMAKE_CURRENT_SOURCE_DIR}/gnucash_core.i ${CMAKE_CURRENT_SOURCE_DIR}/time64.i)
 set(GNUCASH_CORE_C_INCLUDES
@@ -45,9 +45,9 @@ gnc_add_swig_python_command (swig-gnucash-core
     ${GNUCASH_CORE_C_INCLUDES}
 )
 
-IF(WITH_PYTHON)
+if(WITH_PYTHON)
 
-  SET(gnucash_core_c_INCLUDE_DIRS
+  set(gnucash_core_c_INCLUDE_DIRS
     ${CMAKE_SOURCE_DIR}/libgnucash
     ${CMAKE_SOURCE_DIR}/libgnucash/engine
     ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
@@ -60,48 +60,48 @@ IF(WITH_PYTHON)
     ${PYTHON_INCLUDE_DIRS}
   )
 
-  ADD_LIBRARY(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
+  add_library(gnucash_core_c MODULE ${SWIG_GNUCASH_CORE_C})
-  TARGET_INCLUDE_DIRECTORIES(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
+  target_include_directories(gnucash_core_c PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
 
-  TARGET_LINK_LIBRARIES(gnucash_core_c gncmod-app-utils gncmod-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
+  target_link_libraries(gnucash_core_c gncmod-app-utils gncmod-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
-  SET_TARGET_PROPERTIES(gnucash_core_c PROPERTIES PREFIX "_")
+  set_target_properties(gnucash_core_c PROPERTIES PREFIX "_")
-  TARGET_COMPILE_OPTIONS(gnucash_core_c PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
+  target_compile_options(gnucash_core_c PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
 
-  ADD_EXECUTABLE(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C})
+  add_executable(sqlite3test EXCLUDE_FROM_ALL sqlite3test.c ${SWIG_GNUCASH_CORE_C})
-  TARGET_LINK_LIBRARIES(sqlite3test gncmod-app-utils gncmod-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
+  target_link_libraries(sqlite3test gncmod-app-utils gncmod-engine gnc-module ${GLIB_LIBS} ${PYTHON_LIBRARIES})
-  TARGET_INCLUDE_DIRECTORIES(sqlite3test PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
+  target_include_directories(sqlite3test PRIVATE ${gnucash_core_c_INCLUDE_DIRS})
-  TARGET_COMPILE_OPTIONS(sqlite3test PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
+  target_compile_options(sqlite3test PRIVATE -Wno-implicit -Wno-missing-prototypes -Wno-declaration-after-statement -Wno-missing-declarations)
 
-  ADD_TEST(NAME sqlite3test COMMAND sqlite3test)
+  add_test(NAME sqlite3test COMMAND sqlite3test)
-  ADD_DEPENDENCIES(check sqlite3test)
+  add_dependencies(check sqlite3test)
 
-  INSTALL(TARGETS gnucash_core_c
+  install(TARGETS gnucash_core_c
     LIBRARY DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
     ARCHIVE DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
   )
-  INSTALL(FILES ${PYEXEC_FILES} ${SWIG_GNUCASH_CORE_PY}
+  install(FILES ${PYEXEC_FILES} ${SWIG_GNUCASH_CORE_PY}
     DESTINATION ${PYTHON_SYSCONFIG_OUTPUT}/gnucash
   )
 
-  FILE(COPY ${PYEXEC_FILES} DESTINATION ${PYTHON_SYSCONFIG_BUILD}/gnucash)
+  file(COPY ${PYEXEC_FILES} DESTINATION ${PYTHON_SYSCONFIG_BUILD}/gnucash)
 
-  ADD_CUSTOM_TARGET(gnucash-core-c-py ALL
+  add_custom_target(gnucash-core-c-py ALL
     COMMAND ${CMAKE_COMMAND} -E copy ${SWIG_GNUCASH_CORE_PY} ${PYTHON_SYSCONFIG_BUILD}/gnucash
     DEPENDS ${SWIG_GNUCASH_CORE_C})
 
-  ADD_CUSTOM_TARGET(gnucash-core-c-build ALL
+  add_custom_target(gnucash-core-c-build ALL
     COMMAND ${CMAKE_COMMAND} -E copy ${LIBDIR_BUILD}/gnucash/_gnucash_core_c${CMAKE_SHARED_MODULE_SUFFIX} ${PYTHON_SYSCONFIG_BUILD}/gnucash
     DEPENDS gnucash_core_c)
 
-ENDIF()
+endif()
 
-SET(python_bindings_DATA ${PYEXEC_FILES}
+set(python_bindings_DATA ${PYEXEC_FILES}
   gnucash_core.i
   sqlite3test.c
   time64.i)
 
-SET_LOCAL_DIST(python_bindings_DIST_local CMakeLists.txt 
+set_local_dist(python_bindings_DIST_local CMakeLists.txt
   ${python_bindings_DATA})
 
-SET(python_bindings_DIST ${python_bindings_DIST_local}
+set(python_bindings_DIST ${python_bindings_DIST_local}
   ${test_python_bindings_DIST} ${example_scripts_DIST} PARENT_SCOPE)

bindings/python/example_scripts/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET(example_scripts_DATA
+set(example_scripts_DATA
         account_analysis.py
         change_tax_code.py
         Invoice.tex
@@ -17,5 +17,5 @@ SET(example_scripts_DATA
         rest-api/README
         )
 
-SET_LOCAL_DIST(example_scripts_DIST_local CMakeLists.txt ${example_scripts_DATA})
+set_local_dist(example_scripts_DIST_local CMakeLists.txt ${example_scripts_DATA})
-SET(example_scripts_DIST ${example_scripts_DIST_local} PARENT_SCOPE)
+set(example_scripts_DIST ${example_scripts_DIST_local} PARENT_SCOPE)

bindings/python/example_scripts/rest-api/gnucash_rest.py

@@ -1858,7 +1858,7 @@ class Error(Exception):
 try:
     options, arguments = getopt.getopt(sys.argv[1:], 'nh:', ['host=', 'new='])
 except getopt.GetoptError as err:
-    print(str(err) # will print something like "option -a not recognized")
+    print(str(err)) # will print something like "option -a not recognized"
     print('Usage: python-rest.py <connection string>')
     sys.exit(2)
 

bindings/python/tests/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-IF (WITH_PYTHON)
+if (WITH_PYTHON)
   find_path(test_core_dir "unittest_support.py" PATHS ${CMAKE_BINARY_DIR}/common/test-core ${CMAKE_SOURCE_DIR}/common/test-core)
   if (${test_core_dir} STREQUAL "test_core_dir-NOTFOUND")
     # Because it hasn't been built yet
@@ -7,14 +7,14 @@ IF (WITH_PYTHON)
   endif()
   add_custom_target(test-python-bindings ALL DEPENDS unittest_support gnucash-core-c-build gnucash-core-c-py)
   add_dependencies(check test-python-bindings)
-  ADD_TEST(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
+  add_test(python-bindings ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/runTests.py.in)
-  SET_PROPERTY(TEST python-bindings PROPERTY ENVIRONMENT
+  set_property(TEST python-bindings PROPERTY ENVIRONMENT
     GNC_BUILDDIR=${CMAKE_BINARY_DIR}
     PYTHONPATH=${PYTHON_SYSCONFIG_BUILD}:${LIBDIR_BUILD}/gnucash:${test_core_dir}
   )
-ENDIF()
+endif()
 
-SET(test_python_bindings_DATA
+set(test_python_bindings_DATA
         runTests.py.in
         test_account.py
         test_book.py
@@ -24,4 +24,4 @@ SET(test_python_bindings_DATA
         test_split.py
         test_transaction.py)
 
-SET_DIST_LIST(test_python_bindings_DIST CMakeLists.txt ${test_python_bindings_DATA})
+set_dist_list(test_python_bindings_DIST CMakeLists.txt ${test_python_bindings_DATA})

borrowed/CMakeLists.txt

@@ -1,6 +1,7 @@
-ADD_SUBDIRECTORY(libc)
+add_subdirectory(libc)
-ADD_SUBDIRECTORY(goffice)
+add_subdirectory(goffice)
-ADD_SUBDIRECTORY(gwengui-gtk3)
+add_subdirectory(guile-json)
+add_subdirectory(gwengui-gtk3)
 
-SET_LOCAL_DIST(borrowed_DIST_local CMakeLists.txt README)
+set_local_dist(borrowed_DIST_local CMakeLists.txt README)
-SET(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE)
+set(borrowed_DIST ${borrowed_DIST_local} ${libc_DIST} ${guile-json_DIST} ${goffice_DIST} ${gwengui_gtk3_DIST} PARENT_SCOPE)

borrowed/goffice/CMakeLists.txt

@@ -1,15 +1,15 @@
 set(goffice_noinst_HEADERS go-optionmenu.h go-charmap-sel.h go-glib-extras.h)
 set(goffice_SOURCES go-optionmenu.c go-charmap-sel.c go-glib-extras.c)
 
-#ADD_LIBRARY(gnc-goffice ${goffice_noinst_HEADERS} ${goffice_SOURCES})
+#add_library(gnc-goffice ${goffice_noinst_HEADERS} ${goffice_SOURCES})
 
-#TARGET_LINK_LIBRARIES(gnc-goffice ${GTK_LIBS} ${LIBXML2_LIBS})
+#target_link_libraries(gnc-goffice ${GTK_LIBS} ${LIBXML2_LIBS})
-#TARGET_INCLUDE_DIRECTORIES(gnc-goffice PUBLIC ${GTK_CFLAGS} ${LIBXML2_CFLAGS})
+#target_include_directories(gnc-goffice PUBLIC ${GTK_CFLAGS} ${LIBXML2_CFLAGS})
 
-#INSTALL(TARGETS gnc-goffice
+#install(TARGETS gnc-goffice
 #  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 #  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
 #  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-SET_DIST_LIST(goffice_DIST CMakeLists.txt 
+set_dist_list(goffice_DIST CMakeLists.txt
   README ${goffice_noinst_HEADERS} ${goffice_SOURCES})

borrowed/guile-json/AUTHORS

@@ -0,0 +1,9 @@
+Aleix Conchillo Flaque <aconchillo@gmail.com> is the author and current
+maintainer of guile-json. More details at <http://hacks-galore.org/aleix>.
+
+List of contributors (in alphabetical order):
+
+Jan Nieuwenhuizen <janneke@gnu.org>
+Ian Price <ianprice90@googlemail.com>
+David Thompson <dthompson2@worcester.edu>
+Doug Woos <doug@gamechanger.io>

borrowed/guile-json/CMakeLists.txt

@@ -0,0 +1,19 @@
+add_subdirectory(json)
+
+gnc_add_scheme_targets (guile-json
+  json.scm
+  ""
+  ""
+  FALSE
+)
+
+set_local_dist(guile-json_DIST_LOCAL
+  AUTHORS
+  CMakeLists.txt
+  COPYING.LESSER
+  json.scm
+  NEWS
+  README
+)
+
+set(guile-json_DIST ${guile-json_DIST_LOCAL} ${guile-json-details_DIST} PARENT_SCOPE)

borrowed/guile-json/COPYING.LESSER

@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.

borrowed/guile-json/NEWS

@@ -0,0 +1,62 @@
+
+* Version 0.6.0 (Jan 16, 2017)
+
+  - Deprecate json macro in favor of scheme data types.
+
+
+* Version 0.5.0 (Feb 21, 2015)
+
+  - Allow converting simple alists to json
+      e.g.: (scm->json-string '((a . 1) (b . 2))))
+    (thanks to Jan Nieuwenhuizen)
+
+
+* Version 0.4.0 (Aug 17, 2014)
+
+  - Add unquote-splicing support to json form.
+    (thanks to David Thompson)
+
+
+* Version 0.3.1 (Jul 6, 2013)
+
+  - Use pure sh script syntax in env.in.
+    (thanks to Andrew Gaylard)
+
+
+* Version 0.3.0 (May 13, 2013)
+
+  - Re-licensed under LGPLv3.
+
+  - Use new guile.m4 macro.
+
+  - Convert rationals to floats to comply with JSON spec.
+    (closes github #3, patch from Doug Woos)
+
+
+* Version 0.2.0 (Apr 2, 2013)
+
+  - Improve parser errors by providing an additional parser argument to
+    the json-invalid exception.
+
+
+* Version 0.1.3 (Feb 10, 2013)
+
+  - Automatically update pkg-list.scm version.
+
+
+* Version 0.1.2 (Feb 7, 2013)
+
+  - Fix pretty printing.
+
+  - Use (display) instead of (simple-format) when possible.
+
+
+* Version 0.1.1 (Feb 2, 2013)
+
+  - Use (car)/(cdr) instead of (drop-right)/(last). This should be more
+    efficient.
+
+
+* Version 0.1.0 (Jan 30, 2013)
+
+  Initial release.

borrowed/guile-json/README

@@ -0,0 +1,158 @@
+
+* guile-json
+
+guile-json is a JSON module for Guile. It supports parsing and
+building JSON documents according to the http://json.org
+specification. These are the main features:
+
+- Mostly complies with http://json.org specification (see UTF-8 below).
+
+- Build JSON documents programmatically using scheme data types.
+
+- Supports UTF-8 (doesn't fully support unicode hexadecimal digits).
+
+- Allows JSON pretty printing.
+
+
+* Installation
+
+guile-json is freely available for download under the terms of the GNU
+Lesser General Public License version 3 (LGPLv3+).
+
+Download the latest tarball and untar it:
+
+- [[http://download.savannah.gnu.org/releases/guile-json/guile-json-0.6.0.tar.gz][guile-json-0.6.0.tar.gz]]
+
+Then, run the typical sequence:
+
+    : $ ./configure --prefix=<guile-prefix>
+    : $ make
+    : $ sudo make install
+
+Where <guile-prefix> should preferably be the same as your system Guile
+installation directory (e.g. /usr).
+
+If everything installed successfully you should be up and running:
+
+    : $ guile
+    : scheme@(guile-user)> (use-modules (json))
+    : scheme@(guile-user)> (scm->json '(1 2 3))
+    : [1, 2, 3]
+
+It might be that you installed guile-json somewhere differently than
+your system's Guile. If so, you need to indicate Guile where to find
+guile-json, for example:
+
+    : $ GUILE_LOAD_PATH=/usr/local/share/guile/site guile
+
+A pkg-list.scm file is also provided for users of the
+Guildhall/Dorodango packaging system.
+
+
+* Usage
+
+guile-json provides a few procedures to parse and build a JSON
+document. A JSON document is transformed into or from native Guile
+values according to the following table:
+
+| JSON   | Guile       |
+|--------+-------------|
+| string | string      |
+| number | number      |
+| object | hash-table* |
+| array  | list        |
+| true   | #t          |
+| false  | #f          |
+| null   | #nil        |
+
+*Note* (*): Association lists are also tranformed to JSON objects, in
+this case ordered will be preserved.
+
+To start using guile-json procedures and macros you first need to load
+the module:
+
+    : scheme@(guile-user)> (use-modules (json))
+
+
+** Procedures
+
+- (*json->scm* #:optional port) : Reads a JSON document from the given
+  port, or from the current input port if none is given.
+
+  - /port/ : is optional, it defaults to the current input port.
+
+- (*json-string->scm* str) : Reads a JSON document from the given
+  string.
+
+- (*scm->json* native #:optional port #:key escape pretty) : Creates a
+  JSON document from the given native Guile value. The JSON document is
+  written into the given port, or to the current output port if non is
+  given.
+
+  - /port/ : it defaults to the current output port.
+  - /escape/ : if true, the slash (/ solidus) character will be escaped.
+  - /pretty/ : if true, the JSON document will be pretty printed.
+
+- (*scm->json-string* native #:key escape pretty) : Creates a JSON
+  document from the given native Guile value into a string.
+
+  - /escape/ : if true, the slash (/ solidus) character will be escaped.
+  - /pretty/ : if true, the JSON document will be pretty printed.
+
+
+** Exceptions
+
+A /json-invalid/ exception is thrown if an error is found during the
+JSON parsing. Since version 0.2.0, the /json-invalid/ exception has a
+single parser argument (see predicate and accessors below). The line or
+column where the error occured can be easily obtained from the parser
+port (calling /port-line/ or /port-column/ on the port).
+
+- (*json-parser?* parser) : Tells whether the given argument is a JSON
+  parser record type.
+
+- (*json-parser-port* parser) : Get the port that the parser was reading
+  from.
+
+
+** Examples
+
+- Build the string "hello world":
+
+    : scheme@(guile-user)> (scm->json "hello world")
+    : "hello world"
+
+- Build the [1, 2, 3] array:
+
+    : scheme@(guile-user)> (scm->json '(1 2 3))
+    : [1, 2, 3]
+
+- Build the [1, 2, 3, 4] array using unquote-splicing:
+
+    : scheme@(guile-user)> (define values '(2 3))
+    : scheme@(guile-user)> (scm->json `(1 ,@values 4))
+    : [1, 2, 3, 4]
+
+- Build the object { "project" : "foo", "author" : "bar" } using an
+  association list (see how symbols can also be used):
+
+    : scheme@(guile-user)> (scm->json '(("project" . "foo") (author . bar)))
+    : {"project" : "foo","author" : "bar"}
+
+- Build again the same object { "project" : "foo", "author" : "bar" }
+  using a hash table:
+
+    : scheme@(guile-user)> (scm->json (alist->hash-table '((project . foo) (author . bar))))
+    : {"project" : "foo","author" : "bar"}
+
+- Build the object { "values" : [ 234, 98.56 ] }:
+
+    : scheme@(guile-user)> (scm->json '(("values" 234 98.56)))
+    : {"values" : [234, 98.56]}
+
+- Build the object { "values" : [ 234, 98.56 ] } again, this time using
+  a variable:
+
+    : scheme@(guile-user)> (define values '(234 98.56))
+    : scheme@(guile-user)> (scm->json `(("values" ,@values)))
+    : {"values" : [234, 98.56]}

borrowed/guile-json/json.scm

@@ -0,0 +1,45 @@
+;;; (json) --- Guile JSON implementation.
+
+;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with guile-json; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+;;; Commentary:
+
+;; JSON module for Guile
+
+;;; Code:
+
+(define-module (json)
+  #:use-module (json builder)
+  #:use-module (json parser)
+  #:use-module (json syntax))
+
+(define-syntax re-export-modules
+  (syntax-rules ()
+    ((_ (mod ...) ...)
+     (begin
+       (module-use! (module-public-interface (current-module))
+                    (resolve-interface '(mod ...)))
+       ...))))
+
+(re-export-modules (json builder)
+                   (json parser)
+                   (json syntax))
+
+;;; (json) ends here

borrowed/guile-json/json/CMakeLists.txt

@@ -0,0 +1,17 @@
+set (scm-guile-json-details
+  builder.scm
+  parser.scm
+  syntax.scm
+)
+
+gnc_add_scheme_targets (guile-json-details
+  "${scm-guile-json-details}"
+  json
+  ""
+  FALSE
+)
+
+set_dist_list (guile-json-details_DIST
+  CMakeLists.txt
+  ${scm-guile-json-details}
+)

borrowed/guile-json/json/builder.scm

@@ -0,0 +1,212 @@
+;;; (json builder) --- Guile JSON implementation.
+
+;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;; Copyright (C) 2015,2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with guile-json; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+;;; Commentary:
+
+;; JSON module for Guile
+
+;;; Code:
+
+(define-module (json builder)
+  #:use-module (ice-9 format)
+  #:use-module (srfi srfi-1)
+  #:use-module (rnrs bytevectors)
+  #:export (scm->json
+            scm->json-string))
+
+;;
+;; String builder helpers
+;;
+
+(define (unicode->string unicode)
+  (format #f "\\u~4,'0x" unicode))
+
+(define (char->unicode-string c)
+  (let ((unicode (char->integer c)))
+    (if (< unicode 32)
+        (unicode->string unicode)
+        (string c))))
+
+(define (u8v-2->unicode bv)
+  (let ((bv0 (bytevector-u8-ref bv 0))
+        (bv1 (bytevector-u8-ref bv 1)))
+    (+ (ash (logand bv0 #b00011111) 6)
+       (logand bv1 #b00111111))))
+
+(define (u8v-3->unicode bv)
+  (let ((bv0 (bytevector-u8-ref bv 0))
+        (bv1 (bytevector-u8-ref bv 1))
+        (bv2 (bytevector-u8-ref bv 2)))
+    (+ (ash (logand bv0 #b00001111) 12)
+       (ash (logand bv1 #b00111111) 6)
+       (logand bv2 #b00111111))))
+
+(define (build-char-string c)
+  (let* ((bv (string->utf8 (string c)))
+         (len (bytevector-length bv)))
+    (cond
+     ;; A single byte UTF-8
+     ((eq? len 1) (char->unicode-string c))
+     ;; If we have a 2 or 3 byte UTF-8 we need to output it as \uHHHH
+     ((or (eq? len 2) (eq? len 3))
+      (let ((unicode (if (eq? len 2)
+                         (u8v-2->unicode bv)
+                         (u8v-3->unicode bv))))
+        (unicode->string unicode)))
+     ;; A 4 byte UTF-8 needs to output as \uHHHH\uHHHH
+     ((eq? len 4)
+      (let ((bv4 (string->utf16 (string c))))
+        (string-append
+         (unicode->string (+ (ash (bytevector-u8-ref bv4 0) 8)
+                             (bytevector-u8-ref bv4 1)))
+         (unicode->string (+ (ash (bytevector-u8-ref bv4 2) 8)
+                             (bytevector-u8-ref bv4 3))))))
+     ;; Anything else should wrong, hopefully.
+     (else (throw 'json-invalid)))))
+
+;;
+;; Object builder functions
+;;
+
+(define (build-object-pair p port escape pretty level)
+  (display (indent-string pretty level) port)
+  (json-build-string (car p) port escape)
+  (display " : " port)
+  (json-build (cdr p) port escape pretty level))
+
+(define (build-newline port pretty)
+  (cond (pretty (newline port))))
+
+(define (indent-string pretty level)
+  (if pretty (format #f "~v_" (* 4 level)) ""))
+
+;;
+;; Main builder functions
+;;
+
+(define (json-build-null port)
+  (display "null" port))
+
+(define (json-build-boolean scm port)
+  (display (if scm "true" "false") port))
+
+(define (json-build-number scm port)
+  (if (and (rational? scm) (not (integer? scm)))
+      (display (number->string (exact->inexact scm)) port)
+      (display (number->string scm) port)))
+
+(define (->string x)
+  (cond ((char? x) (make-string 1 x))
+        ((number? x) (number->string x))
+        ((symbol? x) (symbol->string x))
+        (else x)))
+
+(define (atom? x)
+  (or (char? x) (number? x) (string? x) (symbol? x)))
+
+(define (json-alist? x)
+  (and (pair? x)
+       (let loop ((x x))
+         (or (null? x)
+             (null? (car x))
+             (and (pair? (car x)) (atom? (caar x))
+                  (loop (cdr x)))))))
+
+(define (json-build-string scm port escape)
+  (display "\"" port)
+  (display
+   (list->string
+    (fold-right append '()
+                (map
+                 (lambda (c)
+                   (case c
+                     ((#\" #\\) `(#\\ ,c))
+                     ((#\bs) '(#\\ #\b))
+                     ((#\ff) '(#\\ #\f))
+                     ((#\lf) '(#\\ #\n))
+                     ((#\cr) '(#\\ #\r))
+                     ((#\ht) '(#\\ #\t))
+                     ((#\/) (if escape `(#\\ ,c) (list c)))
+                     (else (string->list (build-char-string c)))))
+                 (string->list (->string scm)))))
+   port)
+  (display "\"" port))
+
+(define (json-build-array scm port escape pretty level)
+  (display "[" port)
+  (unless (null? scm)
+    (json-build (car scm) port escape pretty (+ level 1))
+    (for-each (lambda (v)
+                (display ", " port)
+                (json-build v port escape pretty (+ level 1)))
+              (cdr scm)))
+  (display "]" port))
+
+(define (json-build-object scm port escape pretty level)
+  (build-newline port pretty)
+  (simple-format port "~A{" (indent-string pretty level))
+  (build-newline port pretty)
+  (let ((pairs scm))
+    (unless (null? pairs)
+      (build-object-pair (car pairs) port escape pretty (+ level 1))
+      (for-each (lambda (p)
+                  (display "," port)
+                  (build-newline port pretty)
+                  (build-object-pair p port escape pretty (+ level 1)))
+                (cdr pairs))))
+  (build-newline port pretty)
+  (simple-format port "~A}" (indent-string pretty level)))
+
+(define (json-build scm port escape pretty level)
+  (cond
+   ((eq? scm #nil) (json-build-null port))
+   ((boolean? scm) (json-build-boolean scm port))
+   ((number? scm) (json-build-number scm port))
+   ((symbol? scm) (json-build-string (symbol->string scm) port escape))
+   ((string? scm) (json-build-string scm port escape))
+   ((json-alist? scm) (json-build-object scm port escape pretty level))
+   ((list? scm) (json-build-array scm port escape pretty level))
+   ((hash-table? scm)
+    (json-build-object (hash-map->list cons scm) port escape pretty level))
+   (else (throw 'json-invalid))))
+
+;;
+;; Public procedures
+;;
+
+(define* (scm->json scm
+                    #:optional (port (current-output-port))
+                    #:key (escape #f) (pretty #f))
+  "Creates a JSON document from native. The argument @var{scm} contains
+the native value of the JSON document. Takes one optional argument,
+@var{port}, which defaults to the current output port where the JSON
+document will be written."
+  (json-build scm port escape pretty 0))
+
+(define* (scm->json-string scm #:key (escape #f) (pretty #f))
+  "Creates a JSON document from native into a string. The argument
+@var{scm} contains the native value of the JSON document."
+  (call-with-output-string
+   (lambda (p)
+     (scm->json scm p #:escape escape #:pretty pretty))))
+
+;;; (json builder) ends here

borrowed/guile-json/json/parser.scm

@@ -0,0 +1,351 @@
+;;; (json parser) --- Guile JSON implementation.
+
+;; Copyright (C) 2013 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with guile-json; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+;;; Commentary:
+
+;; JSON module for Guile
+
+;;; Code:
+
+(define-module (json parser)
+  #:use-module (ice-9 rdelim)
+  #:use-module (rnrs bytevectors)
+  #:use-module (srfi srfi-9)
+  #:export (json->scm
+            json-string->scm
+            json-parser?
+            json-parser-port))
+
+;;
+;; Parser record and read helpers
+;;
+
+(define-record-type json-parser
+  (make-json-parser port)
+  json-parser?
+  (port json-parser-port))
+
+(define (parser-peek-char parser)
+  (peek-char (json-parser-port parser)))
+
+(define (parser-read-char parser)
+  (read-char (json-parser-port parser)))
+
+(define (parser-read-delimited parser delim handle-delim)
+  (let ((port (json-parser-port parser)))
+    (read-delimited delim port handle-delim)))
+
+;;
+;; Number parsing helpers
+;;
+
+;; Read + or -. . If something different is found, return empty string.
+(define (read-sign parser)
+  (let loop ((c (parser-peek-char parser)) (s ""))
+    (case c
+      ((#\+ #\-)
+       (let ((ch (parser-read-char parser)))
+         (string-append s (string ch))))
+      (else s))))
+
+;; Read digits [0..9]. If something different is found, return empty
+;; string.
+(define (read-digits parser)
+  (let loop ((c (parser-peek-char parser)) (s ""))
+    (case c
+      ((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)
+       (let ((ch (parser-read-char parser)))
+         (loop (parser-peek-char parser)
+               (string-append s (string ch)))))
+      (else s))))
+
+(define (read-exp-part parser)
+  (let ((c (parser-peek-char parser)) (s ""))
+    (case c
+      ;; Stop parsing if whitespace found.
+      ((#\ht #\vt #\lf #\cr #\sp) s)
+      ;; We might be in an array or object, so stop here too.
+      ((#\, #\] #\}) s)
+      ;; We might have the exponential part
+      ((#\e #\E)
+       (let ((ch (parser-read-char parser)) ; current char
+             (sign (read-sign parser))
+             (digits (read-digits parser)))
+         ;; If we don't have sign or digits, we have an invalid
+         ;; number.
+         (if (not (and (string-null? sign)
+                       (string-null? digits)))
+             (string-append s (string ch) sign digits)
+             #f)))
+      ;; If we have a character different than e or E, we have an
+      ;; invalid number.
+      (else #f))))
+
+(define (read-real-part parser)
+  (let ((c (parser-peek-char parser)) (s ""))
+    (case c
+      ;; Stop parsing if whitespace found.
+      ((#\ht #\vt #\lf #\cr #\sp) s)
+      ;; We might be in an array or object, so stop here too.
+      ((#\, #\] #\}) s)
+      ;; If we read . we might have a real number
+      ((#\.)
+       (let ((ch (parser-read-char parser))
+             (digits (read-digits parser)))
+         ;; If we have digits, try to read the exponential part,
+         ;; otherwise we have an invalid number.
+         (cond
+          ((not (string-null? digits))
+           (let ((exp (read-exp-part parser)))
+             (cond
+              (exp (string-append s (string ch) digits exp))
+              (else #f))))
+          (else #f))))
+      ;; If we have a character different than . we might continue
+      ;; processing.
+      (else #f))))
+
+(define (read-number parser)
+  (let loop ((c (parser-peek-char parser)) (s ""))
+    (case c
+      ;; Stop parsing if whitespace found.
+      ((#\ht #\vt #\lf #\cr #\sp) s)
+      ;; We might be in an array or object, so stop here too.
+      ((#\, #\] #\}) s)
+      ((#\-)
+       (let ((ch (parser-read-char parser)))
+         (loop (parser-peek-char parser)
+               (string-append s (string ch)))))
+      ((#\0)
+       (let ((ch (parser-read-char parser)))
+         (string-append s
+                        (string ch)
+                        (or (read-real-part parser)
+                            (throw 'json-invalid parser)))))
+      ((#\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9)
+       (let ((ch (parser-read-char parser)))
+         (string-append s
+                        (string ch)
+                        (read-digits parser)
+                        (or (read-real-part parser)
+                            (read-exp-part parser)
+                            (throw 'json-invalid parser)))))
+      (else (throw 'json-invalid parser)))))
+
+;;
+;; Object parsing helpers
+;;
+
+(define (read-pair parser)
+  ;; Read string key
+  (let ((key (json-read-string parser)))
+    (let loop ((c (parser-peek-char parser)))
+      (case c
+      ;; Skip whitespaces
+      ((#\ht #\vt #\lf #\cr #\sp)
+       (parser-read-char parser)
+       (loop (parser-peek-char parser)))
+      ;; Skip colon and read value
+      ((#\:)
+       (parser-read-char parser)
+       (cons key (json-read parser)))
+      ;; invalid object
+      (else (throw 'json-invalid parser))))))
+
+(define (read-object parser)
+  (let loop ((c (parser-peek-char parser))
+             (pairs (make-hash-table)))
+    (case c
+      ;; Skip whitespaces
+      ((#\ht #\vt #\lf #\cr #\sp)
+       (parser-read-char parser)
+       (loop (parser-peek-char parser) pairs))
+      ;; end of object
+      ((#\})
+       (parser-read-char parser)
+       pairs)
+      ;; Read one pair and continue
+      ((#\")
+       (let ((pair (read-pair parser)))
+         (hash-set! pairs (car pair) (cdr pair))
+         (loop (parser-peek-char parser) pairs)))
+      ;; Skip comma and read more pairs
+      ((#\,)
+       (parser-read-char parser)
+       (loop (parser-peek-char parser) pairs))
+      ;; invalid object
+      (else (throw 'json-invalid parser)))))
+
+;;
+;; Array parsing helpers
+;;
+
+(define (read-array parser)
+  (let loop ((c (parser-peek-char parser)) (values '()))
+    (case c
+      ;; Skip whitespace and comma
+      ((#\ht #\vt #\lf #\cr #\sp #\,)
+       (parser-read-char parser)
+       (loop (parser-peek-char parser) values))
+      ;; end of array
+      ((#\])
+       (parser-read-char parser)
+       values)
+      ;; this can be any json object
+      (else
+       (let ((value (json-read parser)))
+         (loop (parser-peek-char parser)
+               (append values (list value))))))))
+
+;;
+;; String parsing helpers
+;;
+
+(define (expect parser expected)
+  (let ((ch (parser-read-char parser)))
+    (if (not (char=? ch expected))
+      (throw 'json-invalid parser)
+      ch)))
+
+(define (expect-string parser expected)
+  (list->string
+   (map (lambda (ch) (expect parser ch))
+        (string->list expected))))
+
+(define (read-hex-digit parser)
+  (let ((c (parser-read-char parser)))
+    (case c
+      ((#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9
+        #\A #\B #\C #\D #\E #\F #\a #\b #\c #\d #\e #\f) c)
+      (else (throw 'json-invalid parser)))))
+
+(define (read-control-char parser)
+  (let ((c (parser-read-char parser)))
+    (case c
+      ((#\" #\\ #\/) (string c))
+      ((#\b) (string #\bs))
+      ((#\f) (string #\ff))
+      ((#\n) (string #\lf))
+      ((#\r) (string #\cr))
+      ((#\t) (string #\ht))
+      ((#\u)
+       (let* ((utf1 (string (read-hex-digit parser)
+                            (read-hex-digit parser)))
+              (utf2 (string (read-hex-digit parser)
+                            (read-hex-digit parser)))
+              (vu8 (list (string->number utf1 16)
+                         (string->number utf2 16)))
+              (utf (u8-list->bytevector vu8)))
+         (utf16->string utf)))
+      (else #f))))
+
+(define (read-string parser)
+  ;; Read characters until \ or " are found.
+  (let loop ((result "")
+             (current (parser-read-delimited parser "\\\"" 'split)))
+    (case (cdr current)
+      ((#\")
+       (string-append result (car current)))
+      ((#\\)
+       (let ((ch (read-control-char parser)))
+         (if ch
+             (loop (string-append result (car current) ch)
+                   (parser-read-delimited parser "\\\"" 'split))
+             (throw 'json-invalid parser ))))
+      (else
+       (throw 'json-invalid parser)))))
+
+;;
+;; Main parser functions
+;;
+
+(define-syntax json-read-delimited
+  (syntax-rules ()
+    ((json-read-delimited parser delim read-func)
+     (let loop ((c (parser-read-char parser)))
+       (case c
+         ;; skip whitespace
+         ((#\ht #\vt #\lf #\cr #\sp) (loop (parser-peek-char parser)))
+         ;; read contents
+         ((delim) (read-func parser))
+         (else (throw 'json-invalid parser)))))))
+
+(define (json-read-true parser)
+  (expect-string parser "true")
+  #t)
+
+(define (json-read-false parser)
+  (expect-string parser "false")
+  #f)
+
+(define (json-read-null parser)
+  (expect-string parser "null")
+  #nil)
+
+(define (json-read-object parser)
+  (json-read-delimited parser #\{ read-object))
+
+(define (json-read-array parser)
+  (json-read-delimited parser #\[ read-array))
+
+(define (json-read-string parser)
+  (json-read-delimited parser #\" read-string))
+
+(define (json-read-number parser)
+  (string->number (read-number parser)))
+
+(define (json-read parser)
+  (let loop ((c (parser-peek-char parser)))
+    (cond
+     ;;If we reach the end we might have an incomplete document
+     ((eof-object? c) (throw 'json-invalid parser))
+     (else
+      (case c
+        ;; skip whitespaces
+        ((#\ht #\vt #\lf #\cr #\sp)
+         (parser-read-char parser)
+         (loop (parser-peek-char parser)))
+        ;; read json values
+        ((#\t) (json-read-true parser))
+        ((#\f) (json-read-false parser))
+        ((#\n) (json-read-null parser))
+        ((#\{) (json-read-object parser))
+        ((#\[) (json-read-array parser))
+        ((#\") (json-read-string parser))
+        ;; anything else should be a number
+        (else (json-read-number parser)))))))
+
+;;
+;; Public procedures
+;;
+
+(define* (json->scm #:optional (port (current-input-port)))
+  "Parse a JSON document into native. Takes one optional argument,
+@var{port}, which defaults to the current input port from where the JSON
+document is read."
+  (json-read (make-json-parser port)))
+
+(define* (json-string->scm str)
+  "Parse a JSON document into native. Takes a string argument,
+@var{str}, that contains the JSON document."
+  (call-with-input-string str (lambda (p) (json->scm p))))
+
+;;; (json parser) ends here

borrowed/guile-json/json/syntax.scm

@@ -0,0 +1,76 @@
+;;; (json syntax) --- Guile JSON implementation.
+
+;; Copyright (C) 2013-2017 Aleix Conchillo Flaque <aconchillo@gmail.com>
+;;
+;; This file is part of guile-json.
+;;
+;; guile-json is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU Lesser General Public
+;; License as published by the Free Software Foundation; either
+;; version 3 of the License, or (at your option) any later version.
+;;
+;; guile-json is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; Lesser General Public License for more details.
+;;
+;; You should have received a copy of the GNU Lesser General Public
+;; License along with guile-json; if not, write to the Free Software
+;; Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+;; 02110-1301 USA
+
+;;; Commentary:
+
+;; JSON module for Guile
+
+;;; Code:
+
+(define-module (json syntax)
+  #:use-module (ice-9 deprecated)
+  #:use-module (ice-9 match)
+  #:export (json))
+
+(define (list->hash-table lst)
+  (let loop ((table (make-hash-table))
+             (lst lst))
+    (match lst
+      (((key value) . rest)
+       (hash-set! table key value)
+       (loop table rest))
+      (() table))))
+
+(define-syntax json
+  (syntax-rules (unquote unquote-splicing array object)
+    ((_ (unquote val))
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       val))
+    ((_ ((unquote-splicing val) . rest))
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       (append val (json rest))))
+    ((_ (array val . rest))
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       (cons (json val) (json rest))))
+    ((_ (object key+val ...))
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       (list->hash-table
+	(json (array key+val ...)))))
+    ((_ (val . rest))
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       (cons (json val) (json rest))))
+    ((_ val)
+     (begin
+       (issue-deprecation-warning
+	"`json' macro is deprecated. Use scheme data types instead.")
+       (quote val)))))
+
+;;; (json syntax) ends here

borrowed/gwengui-gtk3/CMakeLists.txt

@@ -1,16 +1,16 @@
-SET (gwengui_gtk3_noinst_HEADERS
+set (gwengui_gtk3_noinst_HEADERS
   gtk3_gui.h
   gtk3_gui_p.h
   gtk3_gui_dialog_l.h
   gtk3_gui_dialog_p.h
   )
 
-SET (gwengui_gtk3_SOURCES
+set (gwengui_gtk3_SOURCES
   gtk3_gui_dialog.c
   gtk3_gui.c
   )
 
-SET (gwengui_gtk3_EXTRA_DIST
+set (gwengui_gtk3_EXTRA_DIST
   w_combobox.c
   w_label.c
   w_dialog.c
@@ -37,23 +37,23 @@ SET (gwengui_gtk3_EXTRA_DIST
   w_spinbox.c
   )
 
-SET_DIST_LIST(gwengui_gtk3_DIST CMakeLists.txt 
+set_dist_list(gwengui_gtk3_DIST CMakeLists.txt
   ${gwengui_gtk3_SOURCES}
   ${gwengui_gtk3_noinst_HEADERS}
   ${gwengui_gtk3_EXTRA_DIST}
   )
 
 if (WITH_AQBANKING AND NOT HAVE_GWEN_GTK3)
-    ADD_LIBRARY(gwengui-gtk3 ${gwengui_gtk3_SOURCES})
+    add_library(gwengui-gtk3 ${gwengui_gtk3_SOURCES})
 
-    TARGET_COMPILE_DEFINITIONS(gwengui-gtk3 PRIVATE BUILDING_GTK3_GUI=True)
+    target_compile_definitions(gwengui-gtk3 PRIVATE BUILDING_GTK3_GUI=True)
-    TARGET_INCLUDE_DIRECTORIES(gwengui-gtk3 PUBLIC
+    target_include_directories(gwengui-gtk3 PUBLIC
         ${GTK3_INCLUDE_DIRS}
         ${GWENHYWFAR_INCLUDE_DIRS}
     )
-    TARGET_LINK_LIBRARIES(gwengui-gtk3 ${GWENHYWFAR_LDFLAGS} ${GTK3_LDFLAGS})
+    target_link_libraries(gwengui-gtk3 ${GWENHYWFAR_LDFLAGS} ${GTK3_LDFLAGS})
 
-    INSTALL(TARGETS gwengui-gtk3
+    install(TARGETS gwengui-gtk3
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}

borrowed/libc/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(libc_SOURCES libc-missing-noop.c setenv.c strfmon.c strptime.c)
+set(libc_SOURCES libc-missing-noop.c setenv.c strfmon.c strptime.c)
-SET(libc_HEADERS pow.h setenv.h strfmon.h strptime.h)
+set(libc_HEADERS pow.h setenv.h strfmon.h strptime.h)
 
-SET_DIST_LIST(libc_DIST CMakeLists.txt ${libc_SOURCES} ${libc_HEADERS})
+set_dist_list(libc_DIST CMakeLists.txt ${libc_SOURCES} ${libc_HEADERS})

cmake/CMakeLists.txt

@@ -1,11 +1,11 @@
 # Post install actions go here.
 
-IF (APPLE)
+if (APPLE)
-  INSTALL(CODE "EXECUTE_PROCESS(
+  install(CODE "execute_process(
                 COMMAND /usr/bin/install_name_tool -add_rpath ${CMAKE_INSTALL_LIBDIR}
                                                    -add_rpath ${PKGLIBDIR}
                                                    ${CMAKE_INSTALL_BINDIR}/gnucash)")
-ENDIF(APPLE)
+endif(APPLE)
 
 
-SET_DIST_LIST(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)
+set_dist_list(cmake_DIST CMakeLists.txt README_CMAKE.txt cmake_uninstall.cmake.in)

common/CMakeLists.txt

@@ -1,11 +1,11 @@
 # CMakeLists.txt for common/
 
 # The subdirectories
-ADD_SUBDIRECTORY (cmake_modules)
+add_subdirectory (cmake_modules)
-ADD_SUBDIRECTORY (debug)
+add_subdirectory (debug)
-ADD_SUBDIRECTORY (test-core)
+add_subdirectory (test-core)
 
-SET(common_EXTRA_DIST
+set(common_EXTRA_DIST
         base-typemaps.i
         config.h.cmake.in
         gnc-test-env.pl
@@ -28,6 +28,6 @@ dist_add_generated (${GENERATE_SWIG_WRAPPERS} swig-runtime.h)
 
 add_custom_target (swig-runtime-h DEPENDS ${SWIG_RUNTIME_H})
 
-SET_LOCAL_DIST(common_DIST_local CMakeLists.txt ${common_EXTRA_DIST})
+set_local_dist(common_DIST_local CMakeLists.txt ${common_EXTRA_DIST})
 
-SET(common_DIST ${common_DIST_local} ${cmake_modules_DIST} ${debug_DIST} ${test_core_DIST} PARENT_SCOPE)
+set(common_DIST ${common_DIST_local} ${cmake_modules_DIST} ${debug_DIST} ${test_core_DIST} PARENT_SCOPE)

common/cmake_modules/CMakeLists.txt

@@ -1,6 +1,6 @@
 
-SET(cmake_FILES GncAddGSchemaTargets.cmake GncAddSchemeTargets.cmake GncAddSwigCommand.cmake GncAddTest.cmake
+set(cmake_FILES GncAddGSchemaTargets.cmake GncAddSchemeTargets.cmake GncAddSwigCommand.cmake GncAddTest.cmake
         GncFindPkgConfig.cmake MacroAddSourceFileCompileFlags.cmake MacroAppendForeach.cmake
         MakeDist.cmake MakeDistFiles.cmake MakeDistCheck.cmake)
 
-SET_DIST_LIST(cmake_modules_DIST CMakeLists.txt COPYING-CMAKE-SCRIPTS.txt ${cmake_FILES})
+set_dist_list(cmake_modules_DIST CMakeLists.txt COPYING-CMAKE-SCRIPTS.txt ${cmake_FILES})

common/cmake_modules/GncAddGSchemaTargets.cmake

@@ -1,11 +1,11 @@
 macro(add_gschema_targets _gschema_INPUTS)
-  SET(_gschema_OUTPUTS "")
+  set(_gschema_OUTPUTS "")
   set(local_depends ${gschema_depends})
-  SET(CMAKE_COMMAND_TMP "")
+  set(CMAKE_COMMAND_TMP "")
-  IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+  if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-    SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+    set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-  ENDIF()
+  endif()
-  FOREACH(file ${_gschema_INPUTS})
+  foreach(file ${_gschema_INPUTS})
 
     set(_OUTPUT_FILE ${DATADIR_BUILD}/glib-2.0/schemas/${file})
     configure_file(${file}.in ${_OUTPUT_FILE} @ONLY)
@@ -14,7 +14,7 @@ macro(add_gschema_targets _gschema_INPUTS)
     string(REPLACE ".xml" ".valid" file_no_xml ${file})
     set(_VALID_FILE ${CMAKE_CURRENT_BINARY_DIR}/${file_no_xml})
     list(APPEND _gschema_VALIDS ${_VALID_FILE})
-    ADD_CUSTOM_COMMAND(
+    add_custom_command(
         OUTPUT ${_VALID_FILE}
         COMMAND ${CMAKE_COMMAND_TMP}
           ${GLIB_COMPILE_SCHEMAS} --strict --dry-run --schema-file=${_OUTPUT_FILE}
@@ -29,10 +29,10 @@ macro(add_gschema_targets _gschema_INPUTS)
     # The file level one is to ensure gschemas.compiled will be rebuilt if any of the
     # dependencies changes.
     list(APPEND local_depends ${file_no_xml}-target ${_VALID_FILE})
-  ENDFOREACH(file)
+  endforeach(file)
 
   set(gschema_depends ${local_depends} CACHE INTERNAL "gschemas.compiled dependencies")
 
-  INSTALL(FILES ${_gschema_OUTPUTS} DESTINATION share/glib-2.0/schemas)
+  install(FILES ${_gschema_OUTPUTS} DESTINATION share/glib-2.0/schemas)
 
 endmacro()

common/cmake_modules/GncAddSchemeTargets.cmake

@@ -14,138 +14,138 @@
 # Boston, MA  02110-1301,  USA       gnu@gnu.org
 
 #Guile and ltdl require MSYS paths on MinGW-w64; this function transforms them.
-FUNCTION(MAKE_UNIX_PATH PATH)
+function(make_unix_path PATH)
-    STRING(REGEX REPLACE "^([A-Za-z]):" "/\\1" newpath ${${PATH}})
+    string(REGEX REPLACE "^([A-Za-z]):" "/\\1" newpath ${${PATH}})
     string(REGEX REPLACE "\\\\" "/" newpath ${newpath})
-    SET(${PATH} ${newpath} PARENT_SCOPE)
+    set(${PATH} ${newpath} PARENT_SCOPE)
-ENDFUNCTION()
+endfunction()
 
 #PATH variables in the environment are separated by colons, but CMake lists are separated by semicolons. This function transforms the separators.
-FUNCTION(MAKE_UNIX_PATH_LIST PATH)
+function(make_unix_path_list PATH)
-    STRING(REPLACE ";" ":" newpath "${${PATH}}")
+    string(REPLACE ";" ":" newpath "${${PATH}}")
-    SET(${PATH} ${newpath} PARENT_SCOPE)
+    set(${PATH} ${newpath} PARENT_SCOPE)
-ENDFUNCTION()
+endfunction()
 
-FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
+function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
 				MAKE_LINKS)
-  SET(__DEBUG FALSE)
+  set(__DEBUG FALSE)
-  IF (__DEBUG)
+  if (__DEBUG)
-    MESSAGE("Parameters to COMPILE_SCHEME for target ${_TARGET}")
+    message("Parameters to COMPILE_SCHEME for target ${_TARGET}")
-    MESSAGE("   SOURCE_FILES: ${_SOURCE_FILES}")
+    message("   SOURCE_FILES: ${_SOURCE_FILES}")
-    MESSAGE("   GUILE_DEPENDS: ${_GUILE_DEPENDS}")
+    message("   GUILE_DEPENDS: ${_GUILE_DEPENDS}")
-    MESSAGE("   DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}")
+    message("   DIRECTORIES: ${BINDIR_BUILD}, ${LIBDIR_BUILD}, ${DATADIR_BUILD}")
-  ENDIF(__DEBUG)
+  endif(__DEBUG)
-  SET(_CMD "create_symlink")
+  set(_CMD "create_symlink")
-  IF(WIN32)
+  if(WIN32)
-    SET(_CMD "copy")
+    set(_CMD "copy")
-  ENDIF(WIN32)
+  endif(WIN32)
-  SET(current_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
+  set(current_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
-  SET(current_bindir ${CMAKE_CURRENT_BINARY_DIR})
+  set(current_bindir ${CMAKE_CURRENT_BINARY_DIR})
-  SET(build_bindir ${BINDIR_BUILD})
+  set(build_bindir ${BINDIR_BUILD})
-  SET(build_libdir ${LIBDIR_BUILD})
+  set(build_libdir ${LIBDIR_BUILD})
-  SET(build_datadir ${DATADIR_BUILD})
+  set(build_datadir ${DATADIR_BUILD})
-  IF(MINGW64)
+  if(MINGW64)
-    MAKE_UNIX_PATH(build_bindir)
+    make_unix_path(build_bindir)
-    MAKE_UNIX_PATH(build_libdir)
+    make_unix_path(build_libdir)
-    MAKE_UNIX_PATH(build_datadir)
+    make_unix_path(build_datadir)
-    MAKE_UNIX_PATH(current_bindir)
+    make_unix_path(current_bindir)
-    MAKE_UNIX_PATH(current_srcdir)
+    make_unix_path(current_srcdir)
-    MAKE_UNIX_PATH(CMAKE_BINARY_DIR)
+    make_unix_path(CMAKE_BINARY_DIR)
-    MAKE_UNIX_PATH(CMAKE_SOURCE_DIR)
+    make_unix_path(CMAKE_SOURCE_DIR)
-  ENDIF(MINGW64)
+  endif(MINGW64)
 
   # If links are requested, we simple link (or copy, for Windows) each source file to the dest directory
-  IF(MAKE_LINKS)
+  if(MAKE_LINKS)
-    SET(_LINK_DIR ${DATADIR_BUILD}/gnucash/scm/${_OUTPUT_DIR})
+    set(_LINK_DIR ${DATADIR_BUILD}/gnucash/scm/${_OUTPUT_DIR})
-    FILE(MAKE_DIRECTORY ${_LINK_DIR})
+    file(MAKE_DIRECTORY ${_LINK_DIR})
-    SET(_SCHEME_LINKS "")
+    set(_SCHEME_LINKS "")
-    FOREACH(scheme_file ${_SOURCE_FILES})
+    foreach(scheme_file ${_SOURCE_FILES})
-      SET(_SOURCE_FILE ${current_srcdir}/${scheme_file})
+      set(_SOURCE_FILE ${current_srcdir}/${scheme_file})
-      IF(IS_ABSOLUTE ${scheme_file})
+      if(IS_ABSOLUTE ${scheme_file})
-        SET(_SOURCE_FILE ${scheme_file})
+        set(_SOURCE_FILE ${scheme_file})
-      ENDIF()
+      endif()
-      GET_FILENAME_COMPONENT(name ${scheme_file} NAME)
+      get_filename_component(name ${scheme_file} NAME)
-      SET(_OUTPUT_FILE ${_LINK_DIR}/${name})
+      set(_OUTPUT_FILE ${_LINK_DIR}/${name})
-      IF(NOT EXISTS ${_OUTPUT_FILE})
+      if(NOT EXISTS ${_OUTPUT_FILE})
-        LIST(APPEND _SCHEME_LINKS ${_OUTPUT_FILE})
+        list(APPEND _SCHEME_LINKS ${_OUTPUT_FILE})
-        ADD_CUSTOM_COMMAND(
+        add_custom_command(
             OUTPUT ${_OUTPUT_FILE}
             COMMAND ${CMAKE_COMMAND} -E ${_CMD} ${_SOURCE_FILE} ${_OUTPUT_FILE}
         )
-      ENDIF()
+      endif()
-    ENDFOREACH(scheme_file)
+    endforeach(scheme_file)
-    ADD_CUSTOM_TARGET(${_TARGET}-links ALL DEPENDS ${_SCHEME_LINKS})
+    add_custom_target(${_TARGET}-links ALL DEPENDS ${_SCHEME_LINKS})
-  ENDIF(MAKE_LINKS)
+  endif(MAKE_LINKS)
 
   # Construct the guile source and compiled load paths
 
-  SET(_GUILE_LOAD_PATH "${current_srcdir}"
+  set(_GUILE_LOAD_PATH "${current_srcdir}"
       "${current_bindir}" "${CMAKE_BINARY_DIR}/libgnucash/scm")  # to pick up generated build-config.scm
-  SET(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
+  set(_GUILE_LOAD_COMPILED_PATH "${current_bindir}")
 
-  SET(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
+  set(_GUILE_CACHE_DIR ${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
-  SET(_GUILE_LOAD_PATH "${current_srcdir}")
+  set(_GUILE_LOAD_PATH "${current_srcdir}")
-  IF (MAKE_LINKS)
+  if (MAKE_LINKS)
-      LIST(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm")
+      list(APPEND _GUILE_LOAD_PATH "${build_datadir}/gnucash/scm")
-  ENDIF()
+  endif()
-  SET(_GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
+  set(_GUILE_LOAD_COMPILED_PATH ${build_libdir}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION})
 
-  SET(_TARGET_FILES "")
+  set(_TARGET_FILES "")
 
-  FOREACH(source_file ${_SOURCE_FILES})
+  foreach(source_file ${_SOURCE_FILES})
-      SET(guile_depends ${_GUILE_DEPENDS})
+      set(guile_depends ${_GUILE_DEPENDS})
-      GET_FILENAME_COMPONENT(basename ${source_file} NAME_WE)
+      get_filename_component(basename ${source_file} NAME_WE)
 
-      SET(output_file ${basename}.go)
+      set(output_file ${basename}.go)
-      SET(_TMP_OUTPUT_DIR ${_OUTPUT_DIR})
+      set(_TMP_OUTPUT_DIR ${_OUTPUT_DIR})
-      IF (_TMP_OUTPUT_DIR)
+      if (_TMP_OUTPUT_DIR)
-        SET(output_file ${_OUTPUT_DIR}/${basename}.go)
+        set(output_file ${_OUTPUT_DIR}/${basename}.go)
-      ENDIF()
+      endif()
-      SET(output_file ${_GUILE_CACHE_DIR}/${output_file})
+      set(output_file ${_GUILE_CACHE_DIR}/${output_file})
-      LIST(APPEND _TARGET_FILES ${output_file})
+      list(APPEND _TARGET_FILES ${output_file})
 
-      SET(source_file_abs_path ${CMAKE_CURRENT_SOURCE_DIR}/${source_file})
+      set(source_file_abs_path ${CMAKE_CURRENT_SOURCE_DIR}/${source_file})
-      IF (IS_ABSOLUTE ${source_file})
+      if (IS_ABSOLUTE ${source_file})
-        SET(source_file_abs_path ${source_file})
+        set(source_file_abs_path ${source_file})
-      ENDIF()
+      endif()
-      IF (__DEBUG)
+      if (__DEBUG)
-        MESSAGE("ADD_CUSTOM_COMMAND: output = ${output_file}")
+        message("add_custom_command: output = ${output_file}")
-      ENDIF()
+      endif()
-      SET(CMAKE_COMMMAND_TMP "")
+      set(CMAKE_COMMMAND_TMP "")
-      IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+      if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-        SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+        set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-      ENDIF()
+      endif()
-      IF (MINGW64)
+      if (MINGW64)
         set(fpath "")
         foreach(dir $ENV{PATH})
-            MAKE_UNIX_PATH(dir)
+            make_unix_path(dir)
             set(fpath "${fpath}${dir}:")
         endforeach(dir)
-        SET(LIBRARY_PATH "PATH=\"${build_bindir}:${fpath}\"")
+        set(LIBRARY_PATH "PATH=\"${build_bindir}:${fpath}\"")
-      ELSE (MINGW64)
+      else (MINGW64)
-        SET (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
+        set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
-      ENDIF (MINGW64)
+      endif (MINGW64)
-      IF (APPLE)
+      if (APPLE)
-        SET (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
+        set (LIBRARY_PATH "DYLD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash:${_GUILE_LD_LIBRARY_PATH}")
-      ENDIF (APPLE)
+      endif (APPLE)
-      SET(_GNC_MODULE_PATH "")
+      set(_GNC_MODULE_PATH "")
-      IF(MINGW64)
+      if(MINGW64)
-        SET(_GNC_MODULE_PATH "${build_bindir}")
+        set(_GNC_MODULE_PATH "${build_bindir}")
-      ELSE(MINGW64)
+      else(MINGW64)
-        SET(_GNC_MODULE_PATH "${LIBDIR_BUILD}" "${LIBDIR_BUILD}/gnucash" "${GNC_MODULE_PATH}")
+        set(_GNC_MODULE_PATH "${LIBDIR_BUILD}" "${LIBDIR_BUILD}/gnucash" "${GNC_MODULE_PATH}")
-      ENDIF(MINGW64)
+      endif(MINGW64)
-      MAKE_UNIX_PATH_LIST(_GUILE_LOAD_PATH)
+      make_unix_path_list(_GUILE_LOAD_PATH)
-      MAKE_UNIX_PATH_LIST(_GUILE_LOAD_COMPILED_PATH)
+      make_unix_path_list(_GUILE_LOAD_COMPILED_PATH)
-      MAKE_UNIX_PATH_LIST(_GUILE_LD_LIBRARY_PATH)
+      make_unix_path_list(_GUILE_LD_LIBRARY_PATH)
-      MAKE_UNIX_PATH_LIST(_GNC_MODULE_PATH)
+      make_unix_path_list(_GNC_MODULE_PATH)
-      IF (__DEBUG)
+      if (__DEBUG)
-        MESSAGE("  ")
+        message("  ")
-        MESSAGE("   LIBRARY_PATH: ${LIBRARY_PATH}")
+        message("   LIBRARY_PATH: ${LIBRARY_PATH}")
-        MESSAGE("   GUILE_LOAD_PATH: ${_GUILE_LOAD_PATH}")
+        message("   GUILE_LOAD_PATH: ${_GUILE_LOAD_PATH}")
-        MESSAGE("   GUILE_LOAD_COMPILED_PATH: ${_GUILE_LOAD_COMPILED_PATH}")
+        message("   GUILE_LOAD_COMPILED_PATH: ${_GUILE_LOAD_COMPILED_PATH}")
-        MESSAGE("   GNC_MODULE_PATH: ${_GNC_MODULE_PATH}")
+        message("   GNC_MODULE_PATH: ${_GNC_MODULE_PATH}")
-      ENDIF(__DEBUG)
+      endif(__DEBUG)
-      ADD_CUSTOM_COMMAND(
+      add_custom_command(
         OUTPUT ${output_file}
         COMMAND ${CMAKE_COMMAND_TMP}
             ${LIBRARY_PATH}
@@ -158,11 +158,11 @@ FUNCTION(GNC_ADD_SCHEME_TARGETS _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
         DEPENDS ${guile_depends}
         MAIN_DEPENDENCY ${source_file_abs_path}
         )
-  ENDFOREACH(source_file)
+  endforeach(source_file)
-  IF (__DEBUG)
+  if (__DEBUG)
-    MESSAGE("TARGET_FILES are ${_TARGET_FILES}")
+    message("TARGET_FILES are ${_TARGET_FILES}")
-  ENDIF(__DEBUG)
+  endif(__DEBUG)
-  ADD_CUSTOM_TARGET(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
+  add_custom_target(${_TARGET} ALL DEPENDS ${_TARGET_FILES})
-  INSTALL(FILES ${_TARGET_FILES} DESTINATION ${SCHEME_INSTALLED_CACHE_DIR}/${_OUTPUT_DIR})
+  install(FILES ${_TARGET_FILES} DESTINATION ${SCHEME_INSTALLED_CACHE_DIR}/${_OUTPUT_DIR})
-  INSTALL(FILES ${_SOURCE_FILES} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/${_OUTPUT_DIR})
+  install(FILES ${_SOURCE_FILES} DESTINATION ${SCHEME_INSTALLED_SOURCE_DIR}/${_OUTPUT_DIR})
-ENDFUNCTION(GNC_ADD_SCHEME_TARGETS)
+endfunction(gnc_add_scheme_targets)

common/cmake_modules/GncAddTest.cmake

@@ -1,21 +1,21 @@
 
 
-FUNCTION(GET_GUILE_ENV)
+function(get_guile_env)
-  SET(_GNC_MODULE_PATH ${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash)
+  set(_GNC_MODULE_PATH ${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash)
-  IF (WIN32)
+  if (WIN32)
-    SET(_GNC_MODULE_PATH ${CMAKE_BINARY_DIR}/bin)
+    set(_GNC_MODULE_PATH ${CMAKE_BINARY_DIR}/bin)
-  ENDIF()
+  endif()
-  SET(env "")
+  set(env "")
-  LIST(APPEND env "GNC_UNINSTALLED=yes")
+  list(APPEND env "GNC_UNINSTALLED=yes")
-  LIST(APPEND env "GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
+  list(APPEND env "GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
-  LIST(APPEND env "GUILE_WARN_DEPRECATED=no")
+  list(APPEND env "GUILE_WARN_DEPRECATED=no")
-  IF (APPLE)
+  if (APPLE)
-    LIST(APPEND env "DYLD_LIBRARY_PATH=${_GNC_MODULE_PATH}")
+    list(APPEND env "DYLD_LIBRARY_PATH=${_GNC_MODULE_PATH}")
-  ENDIF()
+  endif()
-  IF (UNIX)
+  if (UNIX)
-    LIST(APPEND env LD_LIBRARY_PATH=${_GNC_MODULE_PATH})
+    list(APPEND env LD_LIBRARY_PATH=${_GNC_MODULE_PATH})
-  ENDIF()
+  endif()
-  IF (MINGW64)
+  if (MINGW64)
     set(fpath "")
     set(path $ENV{PATH})
     list(INSERT path 0 ${CMAKE_BINARY_DIR}/bin)
@@ -24,154 +24,154 @@ FUNCTION(GET_GUILE_ENV)
       string(REGEX REPLACE "\\\\" "/" dir ${dir})
       set(fpath "${fpath}${dir}:")
     endforeach(dir)
-    LIST(APPEND env "PATH=${fpath}")
+    list(APPEND env "PATH=${fpath}")
     set(compiled_path "${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}")
     string(REGEX REPLACE "^([A-Za-z]):" "/\\1" compiled_path ${compiled_path})
-    LIST(APPEND env GUILE_LOAD_COMPILED_PATH=${compiled_path})
+    list(APPEND env GUILE_LOAD_COMPILED_PATH=${compiled_path})
-  ENDIF(MINGW64)
+  endif(MINGW64)
-  LIST(APPEND env "GNC_MODULE_PATH=${_GNC_MODULE_PATH}")
+  list(APPEND env "GNC_MODULE_PATH=${_GNC_MODULE_PATH}")
-  LIST(APPEND env "GUILE=${GUILE_EXECUTABLE}")
+  list(APPEND env "GUILE=${GUILE_EXECUTABLE}")
 
-  IF (NOT WIN32)
+  if (NOT WIN32)
-    LIST(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}")
+    list(APPEND env "GUILE_LOAD_COMPILED_PATH=${LIBDIR_BUILD}/gnucash/scm/ccache/${GUILE_EFFECTIVE_VERSION}")
-  ENDIF()
+  endif()
-  SET(guile_load_paths "")
+  set(guile_load_paths "")
-  LIST(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-foo)
+  list(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-foo)
-  LIST(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-bar)
+  list(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-bar)
-  LIST(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-baz)
+  list(APPEND guile_load_paths ${CMAKE_CURRENT_SOURCE_DIR}/mod-baz)
-  IF (WIN32)
+  if (WIN32)
-    LIST(APPEND guile_load_paths ${CMAKE_BINARY_DIR}/share/gnucash/scm)
+    list(APPEND guile_load_paths ${CMAKE_BINARY_DIR}/share/gnucash/scm)
-  ENDIF()
+  endif()
-  SET(guile_load_path "${guile_load_paths}")
+  set(guile_load_path "${guile_load_paths}")
-  IF (MINGW64)
+  if (MINGW64)
     set(new_path "")
-    FOREACH(load_item ${guile_load_path})
+    foreach(load_item ${guile_load_path})
       string(REGEX REPLACE "^([A-Za-z]):" "/\\1" load_item ${load_item})
       list(APPEND new_path ${load_item})
-    ENDFOREACH(load_item)
+    endforeach(load_item)
     set(guile_load_path ${new_path})
-  ENDIF (MINGW64)
+  endif (MINGW64)
-  IF (WIN32 AND NOT MINGW64)
+  if (WIN32 AND NOT MINGW64)
-    STRING(REPLACE ";" "\\\\;" GUILE_LOAD_PATH "${guile_load_path}")
+    string(REPLACE ";" "\\\\;" GUILE_LOAD_PATH "${guile_load_path}")
-  ELSE()
+  else()
-    STRING(REPLACE ";" ":" GUILE_LOAD_PATH "${guile_load_path}")
+    string(REPLACE ";" ":" GUILE_LOAD_PATH "${guile_load_path}")
-  ENDIF()
+  endif()
-  LIST(APPEND env GUILE_LOAD_PATH=${GUILE_LOAD_PATH})
+  list(APPEND env GUILE_LOAD_PATH=${GUILE_LOAD_PATH})
-  SET(GUILE_ENV ${env} PARENT_SCOPE)
+  set(GUILE_ENV ${env} PARENT_SCOPE)
-ENDFUNCTION()
+endfunction()
 
 
-FUNCTION(GNC_ADD_TEST _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_NAME)
+function(gnc_add_test _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_NAME)
-  SET(HAVE_ENV_VARS FALSE)
+  set(HAVE_ENV_VARS FALSE)
-  IF (${ARGC} GREATER 4)
+  if (${ARGC} GREATER 4)
     # Extra arguments are treated as environment variables
-    SET(HAVE_ENV_VARS TRUE)
+    set(HAVE_ENV_VARS TRUE)
-  ENDIF()
+  endif()
-  SET(TEST_INCLUDE_DIRS ${${TEST_INCLUDE_VAR_NAME}})
+  set(TEST_INCLUDE_DIRS ${${TEST_INCLUDE_VAR_NAME}})
-  SET(TEST_LIBS ${${TEST_LIBS_VAR_NAME}})
+  set(TEST_LIBS ${${TEST_LIBS_VAR_NAME}})
-  SET_SOURCE_FILES_PROPERTIES (${_SOURCE_FILES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+  set_source_files_properties (${_SOURCE_FILES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
-  ADD_EXECUTABLE(${_TARGET} EXCLUDE_FROM_ALL ${_SOURCE_FILES})
+  add_executable(${_TARGET} EXCLUDE_FROM_ALL ${_SOURCE_FILES})
-  TARGET_LINK_LIBRARIES(${_TARGET} ${TEST_LIBS})
+  target_link_libraries(${_TARGET} ${TEST_LIBS})
-  TARGET_INCLUDE_DIRECTORIES(${_TARGET} PRIVATE ${TEST_INCLUDE_DIRS})
+  target_include_directories(${_TARGET} PRIVATE ${TEST_INCLUDE_DIRS})
-  IF (${HAVE_ENV_VARS})
+  if (${HAVE_ENV_VARS})
-    SET(CMAKE_COMMAND_TMP "")
+    set(CMAKE_COMMAND_TMP "")
-    IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+    if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-      SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
+      set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
-    ENDIF()
+    endif()
-    ADD_TEST(${_TARGET} ${CMAKE_COMMAND_TMP}
+    add_test(${_TARGET} ${CMAKE_COMMAND_TMP}
       ${CMAKE_BINARY_DIR}/bin/${_TARGET}
     )
-    SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
+    set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR};${ARGN}")
-  ELSE()
+  else()
-    ADD_TEST(NAME ${_TARGET} COMMAND ${_TARGET})
+    add_test(NAME ${_TARGET} COMMAND ${_TARGET})
-    SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
+    set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "GNC_UNINSTALLED=YES;GNC_BUILDDIR=${CMAKE_BINARY_DIR}")
-  ENDIF()
+  endif()
-  ADD_DEPENDENCIES(check ${_TARGET})
+  add_dependencies(check ${_TARGET})
-ENDFUNCTION()
+endfunction()
 
-FUNCTION(GNC_ADD_TEST_WITH_GUILE _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_NAME)
+function(gnc_add_test_with_guile _TARGET _SOURCE_FILES TEST_INCLUDE_VAR_NAME TEST_LIBS_VAR_NAME)
-  GET_GUILE_ENV()
+  get_guile_env()
-  GNC_ADD_TEST(${_TARGET} "${_SOURCE_FILES}" "${TEST_INCLUDE_VAR_NAME}" "${TEST_LIBS_VAR_NAME}"
+  gnc_add_test(${_TARGET} "${_SOURCE_FILES}" "${TEST_INCLUDE_VAR_NAME}" "${TEST_LIBS_VAR_NAME}"
     "${GUILE_ENV};${ARGN}"
   )
-ENDFUNCTION()
+endfunction()
 
 
-FUNCTION(GNC_ADD_SCHEME_TEST _TARGET _SOURCE_FILE)
+function(gnc_add_scheme_test _TARGET _SOURCE_FILE)
-  SET(CMAKE_COMMAND_TMP "")
+  set(CMAKE_COMMAND_TMP "")
-  IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+  if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-    SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+    set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-  ENDIF()
+  endif()
-  ADD_TEST(${_TARGET} ${CMAKE_COMMAND_TMP}
+  add_test(${_TARGET} ${CMAKE_COMMAND_TMP}
     ${GUILE_EXECUTABLE} --debug -l ${CMAKE_CURRENT_SOURCE_DIR}/${_SOURCE_FILE} -c "(exit (run-test))"
   )
-  GET_GUILE_ENV()
+  get_guile_env()
-  SET_TESTS_PROPERTIES(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};${ARGN}")
+  set_tests_properties(${_TARGET} PROPERTIES ENVIRONMENT "${GUILE_ENV};${ARGN}")
-ENDFUNCTION()
+endfunction()
 
-FUNCTION(GNC_ADD_SCHEME_TESTS _SOURCE_FILES)
+function(gnc_add_scheme_tests _SOURCE_FILES)
-  FOREACH(test_file ${_SOURCE_FILES})
+  foreach(test_file ${_SOURCE_FILES})
-    GET_FILENAME_COMPONENT(basename ${test_file} NAME_WE)
+    get_filename_component(basename ${test_file} NAME_WE)
-    GNC_ADD_SCHEME_TEST(${basename} ${test_file})
+    gnc_add_scheme_test(${basename} ${test_file})
-  ENDFOREACH()
+  endforeach()
-ENDFUNCTION()
+endfunction()
 
-FUNCTION(GNC_GTEST_CONFIGURE)
+function(gnc_gtest_configure)
-  MESSAGE(STATUS "Checking for GTEST")
+  message(STATUS "Checking for GTEST")
-  IF (NOT DEFINED ${GTEST_ROOT})
+  if (NOT DEFINED ${GTEST_ROOT})
-    SET(GTEST_ROOT $ENV{GTEST_ROOT})
+    set(GTEST_ROOT $ENV{GTEST_ROOT})
-  ENDIF()
+  endif()
-  IF (NOT DEFINED ${GMOCK_ROOT})
+  if (NOT DEFINED ${GMOCK_ROOT})
-    SET(GMOCK_ROOT $ENV{GMOCK_ROOT})
+    set(GMOCK_ROOT $ENV{GMOCK_ROOT})
-  ENDIF()
+  endif()
-  FIND_PATH(GTEST_INCLUDE_DIR gtest/gtest.h
+  find_path(GTEST_INCLUDE_DIR gtest/gtest.h
     PATHS ${GTEST_ROOT}/include ${GMOCK_ROOT}/gtest/include /usr/include)
-  FIND_PATH(GTEST_SRC_DIR src/gtest-all.cc
+  find_path(GTEST_SRC_DIR src/gtest-all.cc
     PATHS ${GTEST_ROOT} ${GMOCK_ROOT}/gtest /usr/src/gtest)
-  FIND_LIBRARY(GTEST_SHARED_LIB gtest)
+  find_library(GTEST_SHARED_LIB gtest)
-  FIND_LIBRARY(GTEST_MAIN_LIB gtest_main)
+  find_library(GTEST_MAIN_LIB gtest_main)
-  IF ((GTEST_SHARED_LIB OR GTEST_SRC_DIR) AND GTEST_INCLUDE_DIR)
+  if ((GTEST_SHARED_LIB OR GTEST_SRC_DIR) AND GTEST_INCLUDE_DIR)
-    SET(THREADS_PREFER_PTHREAD_FLAG ON)
+    set(THREADS_PREFER_PTHREAD_FLAG ON)
-    FIND_PACKAGE(Threads REQUIRED)
+    find_package(Threads REQUIRED)
-    SET(GTEST_FOUND YES CACHE INTERNAL "Found GTest")
+    set(GTEST_FOUND YES CACHE INTERNAL "Found GTest")
-    IF(GTEST_SHARED_LIB)
+    if(GTEST_SHARED_LIB)
-      SET(GTEST_LIB "${GTEST_SHARED_LIB};${GTEST_MAIN_LIB}" PARENT_SCOPE)
+      set(GTEST_LIB "${GTEST_SHARED_LIB};${GTEST_MAIN_LIB}" PARENT_SCOPE)
-      UNSET(GTEST_SRC_DIR CACHE)
+      unset(GTEST_SRC_DIR CACHE)
-    ELSE()
+    else()
-      SET(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
+      set(GTEST_SRC "${GTEST_SRC_DIR}/src/gtest_main.cc" PARENT_SCOPE)
-      SET(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
+      set(GTEST_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgtest.a" PARENT_SCOPE)
-    ENDIF()
+    endif()
-  ELSE()
+  else()
-    MESSAGE(FATAL_ERROR "GTEST not found. Please install it or set GTEST_ROOT or GMOCK_ROOT")
+    message(FATAL_ERROR "GTEST not found. Please install it or set GTEST_ROOT or GMOCK_ROOT")
-  ENDIF()
+  endif()
 
-  MESSAGE(STATUS "Checking for GMOCK")
+  message(STATUS "Checking for GMOCK")
-  FIND_PATH(GMOCK_INCLUDE_DIR gmock/gmock.h
+  find_path(GMOCK_INCLUDE_DIR gmock/gmock.h
     PATHS ${GMOCK_ROOT}/include /usr/include)
   unset(GMOCK_SRC_DIR CACHE)
-  FIND_LIBRARY(GMOCK_SHARED_LIB gmock)
+  find_library(GMOCK_SHARED_LIB gmock)
-  FIND_LIBRARY(GMOCK_MAIN_LIB gmock_main)
+  find_library(GMOCK_MAIN_LIB gmock_main)
-  FIND_PATH(GMOCK_SRC_DIR src/gmock-all.cc
+  find_path(GMOCK_SRC_DIR src/gmock-all.cc
     PATHS ${GMOCK_ROOT} /usr/src/gmock)
   if (GMOCK_SRC_DIR)
-    SET(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}/src")
+    set(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}/src")
   else()
-    FIND_PATH(GMOCK_SRC_DIR gmock-all.cc
+    find_path(GMOCK_SRC_DIR gmock-all.cc
       PATHS ${GMOCK_ROOT} /usr/src/gmock)
     if (GMOCK_SRC_DIR)
-      SET(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}")
+      set(GMOCK_MAIN_SRC_DIR "${GMOCK_SRC_DIR}")
     endif()
   endif()
   if (GMOCK_INCLUDE_DIR AND (GMOCK_SHARED_LIB OR GMOCK_SRC_DIR))
-    SET(GMOCK_FOUND YES PARENT_SCOPE)
+    set(GMOCK_FOUND YES PARENT_SCOPE)
-    IF(GMOCK_SHARED_LIB)
+    if(GMOCK_SHARED_LIB)
-      SET(GMOCK_LIB "${GMOCK_SHARED_LIB};${GMOCK_MAIN_LIB}" PARENT_SCOPE)
+      set(GMOCK_LIB "${GMOCK_SHARED_LIB};${GMOCK_MAIN_LIB}" PARENT_SCOPE)
-      UNSET(GMOCK_SRC_DIR CACHE)
+      unset(GMOCK_SRC_DIR CACHE)
-    ELSE()
+    else()
-      SET(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
+      set(GMOCK_SRC "${GMOCK_MAIN_SRC_DIR}/gmock-all.cc" PARENT_SCOPE)
-      SET(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
+      set(GMOCK_LIB "${CMAKE_BINARY_DIR}/common/test-core/libgmock.a" PARENT_SCOPE)
-    ENDIF()
+    endif()
-  ELSE()
+  else()
-    MESSAGE(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
+    message(FATAL_ERROR "GMOCK not found. Please install it or set GMOCK_ROOT")
-  ENDIF()
+  endif()
-ENDFUNCTION()
+endfunction()

common/cmake_modules/MacroAddSourceFileCompileFlags.cmake

@@ -1,4 +1,4 @@
-# - MACRO_ADD_SOURCE_FILE_COMPILE_FLAGS(<_target> "flags...")
+# - macro_add_source_file_compile_flags(<_target> "flags...")
 
 # Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
 #
@@ -6,14 +6,14 @@
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 
-MACRO (MACRO_ADD_SOURCE_FILE_COMPILE_FLAGS _sourcefile _additionalflags)
+macro (macro_add_source_file_compile_flags _sourcefile _additionalflags)
 
-   GET_SOURCE_FILE_PROPERTY (_flags ${_sourcefile} COMPILE_FLAGS)
+   get_source_file_property (_flags ${_sourcefile} COMPILE_FLAGS)
    if (_flags)
       set(_flags "${_flags} ${_additionalflags}")
    else (_flags)
       set(_flags "${_additionalflags}")
    endif (_flags)
-   SET_SOURCE_FILES_PROPERTIES (${_sourcefile} PROPERTIES COMPILE_FLAGS "${_flags}")
+   set_source_files_properties (${_sourcefile} PROPERTIES COMPILE_FLAGS "${_flags}")
 
-ENDMACRO (MACRO_ADD_SOURCE_FILE_COMPILE_FLAGS)
+endmacro (macro_add_source_file_compile_flags)

common/cmake_modules/MacroAppendForeach.cmake

@@ -1,4 +1,4 @@
-# - MACRO_APPEND_FOREACH(<_targetlist> _prefix _suffix <_sourcelist> )
+# - macro_append_foreach(<_targetlist> _prefix _suffix <_sourcelist> )
 
 # Copyright (c) 2009, Christian Stimming
 
@@ -9,12 +9,12 @@
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-MACRO (MACRO_APPEND_FOREACH _target _prefix _suffix)
+macro (macro_append_foreach _target _prefix _suffix)
 
-  FOREACH (_loop_var ${ARGN})
+  foreach (_loop_var ${ARGN})
 
-	SET (${_target} ${${_target}} "${_prefix}${_loop_var}${_suffix}")
+	set (${_target} ${${_target}} "${_prefix}${_loop_var}${_suffix}")
 	
-  ENDFOREACH (_loop_var)
+  endforeach (_loop_var)
 
-ENDMACRO (MACRO_APPEND_FOREACH)
+endmacro (macro_append_foreach)

common/cmake_modules/MakeDist.cmake

@@ -13,71 +13,71 @@ include(${CMAKE_MODULE_PATH}/MakeDistFiles.cmake)
 
 
 
-FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_FROM_VCS)
+function(make_dist PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_FROM_VCS)
 
-    SET(CMAKE_COMMAND_TMP "")
+    set(CMAKE_COMMAND_TMP "")
-    IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+    if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-        SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+        set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-    ENDIF()
+    endif()
 
     # -- Remove any existing packaging directory.
-    FILE(REMOVE_RECURSE ${PACKAGE_PREFIX})
+    file(REMOVE_RECURSE ${PACKAGE_PREFIX})
 
-    IF (EXISTS ${PACKAGE_PREFIX})
+    if (EXISTS ${PACKAGE_PREFIX})
-        MESSAGE(FATAL_ERROR "Unable to remove existing dist directory \"${PACKAGE_PREFIX}\". Cannot continue.")
+        message(FATAL_ERROR "Unable to remove existing dist directory \"${PACKAGE_PREFIX}\". Cannot continue.")
-    ENDIF()
+    endif()
 
 
     # -- Copy in distributed files
-    IF(NOT EXISTS dist_manifest.txt)
+    if(NOT EXISTS dist_manifest.txt)
         message(FATAL_ERROR "Cannot find dist manifest: dist_manifest.txt")
-    ENDIF()
+    endif()
 
     file(STRINGS dist_manifest.txt ALL_DIST)
 
-    FOREACH(file ${ALL_DIST})
+    foreach(file ${ALL_DIST})
-        IF(NOT EXISTS ${GNUCASH_SOURCE_DIR}/${file})
+        if(NOT EXISTS ${GNUCASH_SOURCE_DIR}/${file})
-            MESSAGE(FATAL_ERROR "Can't find dist file ${GNUCASH_SOURCE_DIR}/${file}")
+            message(FATAL_ERROR "Can't find dist file ${GNUCASH_SOURCE_DIR}/${file}")
-        ENDIF()
+        endif()
-        GET_FILENAME_COMPONENT(dir ${file} DIRECTORY)
+        get_filename_component(dir ${file} DIRECTORY)
-        FILE(MAKE_DIRECTORY ${PACKAGE_PREFIX}/${dir})
+        file(MAKE_DIRECTORY ${PACKAGE_PREFIX}/${dir})
-        FILE(COPY ${GNUCASH_SOURCE_DIR}/${file} DESTINATION ${PACKAGE_PREFIX}/${dir})
+        file(COPY ${GNUCASH_SOURCE_DIR}/${file} DESTINATION ${PACKAGE_PREFIX}/${dir})
-    ENDFOREACH()
+    endforeach()
 
     # -- Copy in build products that are distributed.
 
-    FOREACH(file ${dist_generated})
+    foreach(file ${dist_generated})
-        EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_SOURCE_DIR}/${file} ${PACKAGE_PREFIX}/${file})
+        execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${BUILD_SOURCE_DIR}/${file} ${PACKAGE_PREFIX}/${file})
-        IF (NOT EXISTS ${PACKAGE_PREFIX}/${file})
+        if (NOT EXISTS ${PACKAGE_PREFIX}/${file})
-            MESSAGE(FATAL_ERROR "Copy of ${BUILD_SOURCE_DIR}/${file} to dist dir '${PACKAGE_PREFIX}' failed.")
+            message(FATAL_ERROR "Copy of ${BUILD_SOURCE_DIR}/${file} to dist dir '${PACKAGE_PREFIX}' failed.")
-        ENDIF()
+        endif()
-    ENDFOREACH()
+    endforeach()
 
-    CMAKE_POLICY(SET CMP0012 NEW)
+    cmake_policy(SET CMP0012 NEW)
 
     # -- Create the tarball.
 
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${CMAKE_COMMAND} -E tar cf ${PACKAGE_PREFIX}.tar ${PACKAGE_PREFIX}
             WORKING_DIRECTORY .
             ERROR_MSG "tar command to create ${PACKAGE_PREFIX}.tar failed."
     )
 
     # -- Compress the tarball with gzip
-    EXECUTE_PROCESS(
+    execute_process(
         COMMAND ${CMAKE_COMMAND} -E copy ${PACKAGE_PREFIX}.tar ${PACKAGE_PREFIX}.tar.save
     )
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${CMAKE_COMMAND_TMP} gzip -f ${PACKAGE_PREFIX}.tar
             WORKING_DIRECTORY .
             ERROR_MSG "gzip command to create ${PACKAGE_PREFIX}.tar.gz failed."
     )
 
     # -- Compress the tarball with bzip2
-    EXECUTE_PROCESS(
+    execute_process(
         COMMAND ${CMAKE_COMMAND} -E rename ${PACKAGE_PREFIX}.tar.save ${PACKAGE_PREFIX}.tar
     )
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${CMAKE_COMMAND_TMP} bzip2 -f ${PACKAGE_PREFIX}.tar
             WORKING_DIRECTORY .
             ERROR_MSG "bzip2 command to create ${PACKAGE_PREFIX}.tar.bz2 failed."
@@ -85,19 +85,19 @@ FUNCTION(MAKE_DIST PACKAGE_PREFIX GNUCASH_SOURCE_DIR BUILD_SOURCE_DIR BUILDING_F
 
     # -- Clean up packaging directory.
 
-    FILE(REMOVE_RECURSE ${PACKAGE_PREFIX})
+    file(REMOVE_RECURSE ${PACKAGE_PREFIX})
 
-    IF(EXISTS ${PACKAGE_PREFIX})
+    if(EXISTS ${PACKAGE_PREFIX})
-        MESSAGE(WARNING "Could not remove packaging directory '${PACKAGE_PREFIX}'")
+        message(WARNING "Could not remove packaging directory '${PACKAGE_PREFIX}'")
-    ENDIF()
+    endif()
 
     # -- All done.
 
-    MESSAGE("\n\nDistributions ${PACKAGE_PREFIX}.tar.gz and ${PACKAGE_PREFIX}.tar.bz2 created.\n\n")
+    message("\n\nDistributions ${PACKAGE_PREFIX}.tar.gz and ${PACKAGE_PREFIX}.tar.bz2 created.\n\n")
-ENDFUNCTION()
+endfunction()
 
-IF (NOT WITH_GNUCASH)
+if (NOT WITH_GNUCASH)
-    MESSAGE(SEND_ERROR "Creation of dist tarballs not support when WITH_GNUCASH=OFF.")
+    message(SEND_ERROR "Creation of dist tarballs not support when WITH_GNUCASH=OFF.")
-ENDIF()
+endif()
 
- MAKE_DIST(${PACKAGE_PREFIX} ${GNUCASH_SOURCE_DIR} ${BUILD_SOURCE_DIR} ${BUILDING_FROM_VCS})
+ make_dist(${PACKAGE_PREFIX} ${GNUCASH_SOURCE_DIR} ${BUILD_SOURCE_DIR} ${BUILDING_FROM_VCS})

common/cmake_modules/MakeDistCheck.cmake

@@ -1,33 +1,33 @@
 
 include(MakeDistFiles)
 
-FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
+function(run_dist_check PACKAGE_PREFIX EXT)
 
-    SET(tarball ${PACKAGE_PREFIX}.tar${EXT})
+    set(tarball ${PACKAGE_PREFIX}.tar${EXT})
-    IF (NOT EXISTS ${tarball})
+    if (NOT EXISTS ${tarball})
-        MESSAGE(FATAL_ERROR "Can't find dist tarball '${tarball}'")
+        message(FATAL_ERROR "Can't find dist tarball '${tarball}'")
-    ENDIF()
+    endif()
 
     # Remove the directory we're about to extract to
-    FILE(REMOVE_RECURSE ${PACKAGE_PREFIX})
+    file(REMOVE_RECURSE ${PACKAGE_PREFIX})
 
     # Untar the distribution we want to check
-    SET(TAR_OPTION "zxf")
+    set(TAR_OPTION "zxf")
-    IF (${EXT} STREQUAL ".bz2")
+    if (${EXT} STREQUAL ".bz2")
-        SET(TAR_OPTION "jxf")
+        set(TAR_OPTION "jxf")
-    ENDIF()
+    endif()
         
-    SET(MY_CMAKE_COMMAND "")
+    set(MY_CMAKE_COMMAND "")
-    IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+    if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-        SET(MY_CMAKE_COMMAND ${CMAKE_COMMAND} -E env)
+        set(MY_CMAKE_COMMAND ${CMAKE_COMMAND} -E env)
-    ENDIF()
+    endif()
 
     FIND_PROGRAM(NINJA_COMMAND NAMES ninja ninja-build)
-    IF (${NINJA_COMMAND} STREQUAL "NINJA_COMMAND-NOTFOUND")
+    if (${NINJA_COMMAND} STREQUAL "NINJA_COMMAND-NOTFOUND")
-        MESSAGE(FATAL_ERROR "Can't find the 'ninja' or 'ninja-build' program.")
+        message(FATAL_ERROR "Can't find the 'ninja' or 'ninja-build' program.")
-    ENDIF ()
+    endif ()
 
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${CMAKE_COMMAND} -E tar ${TAR_OPTION} ${tarball}
             WORKING_DIRECTORY .
             ERROR_MSG "Command to untar ${tarball} failed."
@@ -38,13 +38,13 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
 
     # Create a build directory and configure the Cmake build
 
-    SET(BUILD_DIR "_cmake_build")
+    set(BUILD_DIR "_cmake_build")
-    SET(INSTALL_DIR "_cmake_install")
+    set(INSTALL_DIR "_cmake_install")
-    FILE(REMOVE_RECURSE ${BUILD_DIR} ${INSTALL_DIR})
+    file(REMOVE_RECURSE ${BUILD_DIR} ${INSTALL_DIR})
 
-    FILE(MAKE_DIRECTORY ${BUILD_DIR} ${INSTALL_DIR})
+    file(MAKE_DIRECTORY ${BUILD_DIR} ${INSTALL_DIR})
 
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${CMAKE_COMMAND} -G Ninja
               -D CMAKE_C_FLAGS=${CMAKE_C_FLAGS}
               -D CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
@@ -58,35 +58,35 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
     )
 
     # Run ninja in the build directory
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND}
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "Ninja build failed."
     )
 
     # Run ninja install
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} install
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "Ninja install failed."
     )
 
     # Run ninja check in the build directory
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} check
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "Ninja check failed."
     )
 
     # Run ninja dist
-    EXECUTE_PROCESS_AND_CHECK_RESULT(
+    execute_process_and_check_result(
             COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} dist
             WORKING_DIRECTORY ${BUILD_DIR}
             ERROR_MSG "Ninja dist failed."
     )
 
-    MESSAGE("distcheck complete.")
+    message("distcheck complete.")
 
-ENDFUNCTION()
+endfunction()
 
-RUN_DIST_CHECK(${PACKAGE_PREFIX} .gz)
+run_dist_check(${PACKAGE_PREFIX} .gz)

common/cmake_modules/MakeDistFiles.cmake

@@ -1,34 +1,34 @@
 
-IF (${CMAKE_VERSION} VERSION_LESS 3.3)
+if (${CMAKE_VERSION} VERSION_LESS 3.3)
-    INCLUDE(CMakeParseArguments)
+    include(CMakeParseArguments)
-ENDIF()
+endif()
 
 
-FUNCTION(SET_LOCAL_DIST output)
+function(set_local_dist output)
-    SET(dist_files "")
+    set(dist_files "")
-    FOREACH(file ${ARGN})
+    foreach(file ${ARGN})
-        FILE(RELATIVE_PATH relative ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
+        file(RELATIVE_PATH relative ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${file})
-        LIST(APPEND dist_files ${relative})
+        list(APPEND dist_files ${relative})
-    ENDFOREACH()
+    endforeach()
-    SET (${output} ${dist_files} PARENT_SCOPE)
+    set (${output} ${dist_files} PARENT_SCOPE)
-ENDFUNCTION()
+endfunction()
 
-MACRO(SET_DIST_LIST output)
+macro(set_dist_list output)
-    SET_LOCAL_DIST(${output}_TMP ${ARGN})
+    set_local_dist(${output}_TMP ${ARGN})
-    SET(${output} ${${output}_TMP} PARENT_SCOPE)
+    set(${output} ${${output}_TMP} PARENT_SCOPE)
-ENDMACRO()
+endmacro()
 
-FUNCTION(EXECUTE_PROCESS_AND_CHECK_RESULT)
+function(execute_process_and_check_result)
     cmake_parse_arguments(VARS "" "WORKING_DIRECTORY;ERROR_MSG" "COMMAND" ${ARGN})
-    EXECUTE_PROCESS(
+    execute_process(
             COMMAND ${VARS_COMMAND}
             WORKING_DIRECTORY ${VARS_WORKING_DIRECTORY}
             RESULT_VARIABLE RESULT
     )
-    IF (NOT "${RESULT}" STREQUAL "0")
+    if (NOT "${RESULT}" STREQUAL "0")
-        MESSAGE(FATAL_ERROR ${VARS_ERROR_MSG})
+        message(FATAL_ERROR ${VARS_ERROR_MSG})
-    ENDIF()
+    endif()
-ENDFUNCTION()
+endfunction()
 
 # These functions can be called to add generated files (as opposed to source files)
 # to the distribution tarball

common/debug/CMakeLists.txt

@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(valgrind)
+add_subdirectory(valgrind)
 
-SET_LOCAL_DIST(debug_DIST_local CMakeLists.txt )
+set_local_dist(debug_DIST_local CMakeLists.txt )
-SET(debug_DIST ${debug_DIST_local} ${valgrind_DIST} PARENT_SCOPE)
+set(debug_DIST ${debug_DIST_local} ${valgrind_DIST} PARENT_SCOPE)

common/debug/valgrind/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(valgrind_FILES
+set(valgrind_FILES
         valgrind-gdk.supp
         valgrind-glib.supp
         valgrind-gnucash.supp
@@ -8,4 +8,4 @@ SET(valgrind_FILES
         valgrind-x11.supp
         )
 
-SET_DIST_LIST(valgrind_DIST CMakeLists.txt ${valgrind_FILES})
+set_dist_list(valgrind_DIST CMakeLists.txt ${valgrind_FILES})

common/test-core/CMakeLists.txt

@@ -1,9 +1,9 @@
-SET(test_core_SOURCES
+set(test_core_SOURCES
   test-stuff.c
   unittest-support.c
 )
 
-SET(test_core_noinst_HEADERS
+set(test_core_noinst_HEADERS
   test-stuff.h
   unittest-support.h
 )
@@ -18,14 +18,14 @@ INCLUDE_DIRECTORIES(
   ${GUILE_INCLUDE_DIRS}
 )
 
-SET_DIST_LIST(test_core_DIST ${test_core_SOURCES} ${test_core_noinst_HEADERS} CMakeLists.txt
+set_dist_list(test_core_DIST ${test_core_SOURCES} ${test_core_noinst_HEADERS} CMakeLists.txt
         unittest-support.i unittest-support.scm)
 
-ADD_LIBRARY(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS})
+add_library(test-core STATIC ${test_core_SOURCES} ${test_core_noinst_HEADERS})
-TARGET_LINK_LIBRARIES(test-core gncmod-engine ${GLIB2_LDFLAGS})
+target_link_libraries(test-core gncmod-engine ${GLIB2_LDFLAGS})
-IF (UNIX)
+if (UNIX)
-  TARGET_COMPILE_OPTIONS(test-core PRIVATE -fPIC)
+  target_compile_options(test-core PRIVATE -fPIC)
-ENDIF()
+endif()
 
 # Command to generate the swig-unittest-support-guile.c wrapper file
 gnc_add_swig_guile_command (swig-unittest-support-guile-c
@@ -40,23 +40,23 @@ gnc_add_swig_python_command (swig-unittest-support-python
     ${CMAKE_CURRENT_SOURCE_DIR}/unittest-support.i
 )
 
-ADD_LIBRARY(test-core-guile ${SWIG_UNITTEST_SUPPORT_GUILE_C})
+add_library(test-core-guile ${SWIG_UNITTEST_SUPPORT_GUILE_C})
-TARGET_LINK_LIBRARIES(test-core-guile test-core ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS})
+target_link_libraries(test-core-guile test-core ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS})
 
-IF (WITH_PYTHON)
+if (WITH_PYTHON)
-  ADD_LIBRARY(unittest_support MODULE ${SWIG_UNITTEST_SUPPORT_PYTHON_C})
+  add_library(unittest_support MODULE ${SWIG_UNITTEST_SUPPORT_PYTHON_C})
-  TARGET_LINK_LIBRARIES(unittest_support test-core ${PYTHON_LIBRARIES})
+  target_link_libraries(unittest_support test-core ${PYTHON_LIBRARIES})
-  TARGET_INCLUDE_DIRECTORIES(unittest_support PRIVATE ${PYTHON_INCLUDE_DIRS})
+  target_include_directories(unittest_support PRIVATE ${PYTHON_INCLUDE_DIRS})
-  SET_TARGET_PROPERTIES(unittest_support PROPERTIES PREFIX "_")
+  set_target_properties(unittest_support PROPERTIES PREFIX "_")
-ENDIF()
+endif()
 
-SET(test_core_SCHEME unittest-support.scm)
+set(test_core_SCHEME unittest-support.scm)
 
-SET(GUILE_OUTPUT_DIR   gnucash)
+set(GUILE_OUTPUT_DIR   gnucash)
-SET(GUILE_DEPENDS      test-core-guile)
+set(GUILE_DEPENDS      test-core-guile)
 
 
-GNC_ADD_SCHEME_TARGETS(scm-test-core
+gnc_add_scheme_targets(scm-test-core
   ${test_core_SCHEME}
   ${GUILE_OUTPUT_DIR}
   "${GUILE_DEPENDS}"
@@ -65,25 +65,25 @@ GNC_ADD_SCHEME_TARGETS(scm-test-core
 
 add_dependencies(check scm-test-core)
 
-IF(NOT GTEST_SHARED_LIB)
+if(NOT GTEST_SHARED_LIB)
-  SET (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
+  set (lib_gtest_SOURCES ${GTEST_SRC_DIR}/src/gtest-all.cc)
-  ADD_LIBRARY(gtest STATIC  ${lib_gtest_SOURCES})
+  add_library(gtest STATIC  ${lib_gtest_SOURCES})
-  IF(APPLE)
+  if(APPLE)
-    TARGET_COMPILE_OPTIONS(gtest PRIVATE -Wno-missing-prototypes)
+    target_compile_options(gtest PRIVATE -Wno-missing-prototypes)
-  ELSE()
+  else()
-    TARGET_COMPILE_OPTIONS(gtest PRIVATE -Wno-missing-declarations)
+    target_compile_options(gtest PRIVATE -Wno-missing-declarations)
-  ENDIF()
+  endif()
-  TARGET_INCLUDE_DIRECTORIES(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR})
+  target_include_directories(gtest PUBLIC ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR})
-ENDIF()
+endif()
-IF(NOT GMOCK_SHARED_LIB)
+if(NOT GMOCK_SHARED_LIB)
-  SET (lib_gmock_SOURCES ${GMOCK_SRC})
+  set (lib_gmock_SOURCES ${GMOCK_SRC})
-  ADD_LIBRARY(gmock STATIC  ${lib_gmock_SOURCES})
+  add_library(gmock STATIC  ${lib_gmock_SOURCES})
-  IF (APPLE)
+  if (APPLE)
-    TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-prototypes)
+    target_compile_options(gmock PRIVATE -Wno-missing-prototypes)
-  ELSE()
+  else()
-    TARGET_COMPILE_OPTIONS(gmock PRIVATE -Wno-missing-declarations)
+    target_compile_options(gmock PRIVATE -Wno-missing-declarations)
-  ENDIF()
+  endif()
-  TARGET_INCLUDE_DIRECTORIES(gmock PUBLIC
+  target_include_directories(gmock PUBLIC
     ${GTEST_INCLUDE_DIR} ${GTEST_SRC_DIR}
     ${GMOCK_INCLUDE_DIR} ${GMOCK_SRC_DIR})
-ENDIF()
+endif()

data/CMakeLists.txt

@@ -1,11 +1,11 @@
 # CMakeLists.txt for data/
 
 # The subdirectories
-ADD_SUBDIRECTORY (accounts)
+add_subdirectory (accounts)
-ADD_SUBDIRECTORY (checks)
+add_subdirectory (checks)
-ADD_SUBDIRECTORY (pixmaps)
+add_subdirectory (pixmaps)
 
-SET_LOCAL_DIST(data_DIST_local CMakeLists.txt ${data_EXTRA_DIST})
+set_local_dist(data_DIST_local CMakeLists.txt ${data_EXTRA_DIST})
 
-SET(data_DIST ${data_DIST_local} ${accounts_DIST} ${checks_DIST}
+set(data_DIST ${data_DIST_local} ${accounts_DIST} ${checks_DIST}
              ${pixmaps_DIST} PARENT_SCOPE)

data/accounts/C/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -18,8 +18,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(C_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(C_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/C)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/C)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/C)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/C)
 

data/accounts/CMakeLists.txt

@@ -1,48 +1,48 @@
-SET(ACCOUNTS_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/gnucash/accounts)
+set(ACCOUNTS_INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/gnucash/accounts)
-SET(ACCOUNTS_BUILD_DIR ${DATADIR_BUILD}/gnucash/accounts)
+set(ACCOUNTS_BUILD_DIR ${DATADIR_BUILD}/gnucash/accounts)
 
 
 
-ADD_SUBDIRECTORY(C)
+add_subdirectory(C)
-ADD_SUBDIRECTORY(ca)
+add_subdirectory(ca)
-ADD_SUBDIRECTORY(cs)
+add_subdirectory(cs)
-ADD_SUBDIRECTORY(da)
+add_subdirectory(da)
-ADD_SUBDIRECTORY(de_AT)
+add_subdirectory(de_AT)
-ADD_SUBDIRECTORY(de_CH)
+add_subdirectory(de_CH)
-ADD_SUBDIRECTORY(de_DE)
+add_subdirectory(de_DE)
-ADD_SUBDIRECTORY(el_GR)
+add_subdirectory(el_GR)
-ADD_SUBDIRECTORY(en_GB)
+add_subdirectory(en_GB)
-ADD_SUBDIRECTORY(en_IN)
+add_subdirectory(en_IN)
-ADD_SUBDIRECTORY(es_ES)
+add_subdirectory(es_ES)
-ADD_SUBDIRECTORY(es_MX)
+add_subdirectory(es_MX)
-ADD_SUBDIRECTORY(fi_FI)
+add_subdirectory(fi_FI)
-ADD_SUBDIRECTORY(fr_CA)
+add_subdirectory(fr_CA)
-ADD_SUBDIRECTORY(fr_CH)
+add_subdirectory(fr_CH)
-ADD_SUBDIRECTORY(fr_FR)
+add_subdirectory(fr_FR)
-ADD_SUBDIRECTORY(hu_HU)
+add_subdirectory(hu_HU)
-ADD_SUBDIRECTORY(it)
+add_subdirectory(it)
-ADD_SUBDIRECTORY(ja)
+add_subdirectory(ja)
-ADD_SUBDIRECTORY(ko)
+add_subdirectory(ko)
-ADD_SUBDIRECTORY(lt)
+add_subdirectory(lt)
-ADD_SUBDIRECTORY(lv)
+add_subdirectory(lv)
-ADD_SUBDIRECTORY(nb)
+add_subdirectory(nb)
-ADD_SUBDIRECTORY(nl)
+add_subdirectory(nl)
-ADD_SUBDIRECTORY(pl)
+add_subdirectory(pl)
-ADD_SUBDIRECTORY(pt_BR)
+add_subdirectory(pt_BR)
-ADD_SUBDIRECTORY(pt_PT)
+add_subdirectory(pt_PT)
-ADD_SUBDIRECTORY(ru)
+add_subdirectory(ru)
-ADD_SUBDIRECTORY(sk)
+add_subdirectory(sk)
-ADD_SUBDIRECTORY(sv_AX)
+add_subdirectory(sv_AX)
-ADD_SUBDIRECTORY(sv_FI)
+add_subdirectory(sv_FI)
-ADD_SUBDIRECTORY(sv_SE)
+add_subdirectory(sv_SE)
-ADD_SUBDIRECTORY(tr_TR)
+add_subdirectory(tr_TR)
-ADD_SUBDIRECTORY(zh_CN)
+add_subdirectory(zh_CN)
-ADD_SUBDIRECTORY(zh_HK)
+add_subdirectory(zh_HK)
-ADD_SUBDIRECTORY(zh_TW)
+add_subdirectory(zh_TW)
 
-SET_LOCAL_DIST(dist_list CMakeLists.txt )
+set_local_dist(dist_list CMakeLists.txt )
 
-SET(accounts_DIST ${C_DIST} ${CA_DIST} ${CS_DIST} ${DA_DIST} ${DE_AT_DIST} ${DE_CH_DIST} ${DE_DE_DIST} ${EL_GR_DIST}
+set(accounts_DIST ${C_DIST} ${CA_DIST} ${CS_DIST} ${DA_DIST} ${DE_AT_DIST} ${DE_CH_DIST} ${DE_DE_DIST} ${EL_GR_DIST}
                   ${EN_GB_DIST} ${EN_IN_DIST} ${ES_ES_DIST} ${ES_MX_DIST} ${FI_FI_DIST} ${FR_CA_DIST} ${FR_CH_DIST}
                   ${FR_FR_DIST} ${HU_HU_DIST} ${IT_DIST} ${JA_DIST} ${KO_DIST} ${LT_DIST} ${LV_DIST}
                   ${NB_DIST} ${NL_DIST} ${PL_DIST} ${PT_BR_DIST} ${PT_PT_DIST} ${RU_DIST} ${SK_DIST}

data/accounts/ca/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,7 +15,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(CA_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(CA_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ca)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ca)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ca)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ca)

data/accounts/cs/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,7 +15,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(CS_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(CS_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/cs)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/cs)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/cs)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/cs)

data/accounts/da/CMakeLists.txt

@@ -1,10 +1,10 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_car.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_homeloan.gnucash-xea
   acctchrt_homeown.gnucash-xea)
 
-SET_DIST_LIST(DA_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(DA_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/da)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/da)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/da)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/da)

data/accounts/de_AT/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET(dist_account_DATA
+set(dist_account_DATA
   acctchrt_auto.gnucash-xea
   acctchrt_autoloan.gnucash-xea
   acctchrt_brokerage.gnucash-xea
@@ -9,7 +9,7 @@ SET(dist_account_DATA
   acctchrt_investment.gnucash-xea
   acctchrt_kids.gnucash-xea)
 
-SET_DIST_LIST(DE_AT_DIST ${dist_account_DATA} CMakeLists.txt)
+set_dist_list(DE_AT_DIST ${dist_account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${dist_account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_AT)
+install(FILES ${dist_account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_AT)
-FILE(COPY ${dist_account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_AT)
+file(COPY ${dist_account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_AT)

data/accounts/de_CH/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_common.gnucash-xea
   acctchrt_kids.gnucash-xea
@@ -6,7 +6,7 @@ SET(account_DATA
   acctchrt_otherloan.gnucash-xea
   acctchrt_chkmu.gnucash-xea)
 
-SET_DIST_LIST(DE_CH_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(DE_CH_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_CH)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_CH)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_CH)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_CH)

data/accounts/de_DE/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_auto.gnucash-xea
   acctchrt_autoloan.gnucash-xea
   acctchrt_brokerage.gnucash-xea
@@ -14,7 +14,7 @@ SET(account_DATA
   acctchrt_skr04.gnucash-xea
   acctchrt_skr49.gnucash-xea)
 
-SET_DIST_LIST(DE_DE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(DE_DE_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_DE)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/de_DE)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_DE)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/de_DE)

data/accounts/el_GR/CMakeLists.txt

@@ -1,9 +1,9 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_common.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_brokerage.gnucash-xea)
 
-SET_DIST_LIST(EL_GR_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(EL_GR_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/el_GR)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/el_GR)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/el_GR)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/el_GR)

data/accounts/en_GB/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -17,7 +17,7 @@ SET(account_DATA
   acctchrt_spouseretire.gnucash-xea
   uk-vat.gnucash-xea)
 
-SET_DIST_LIST(EN_GB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(EN_GB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_GB)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_GB)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_GB)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_GB)

data/accounts/en_IN/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 
-SET(account_DATA
+set(account_DATA
   acctchrt_gstindia.gnucash-xea)
 # Fixme: do we want to copy this files, too?
 #  acctchrt_brokerage.gnucash-xea
@@ -20,10 +20,10 @@ SET(account_DATA
 #  acctchrt_spouseinc.gnucash-xea
 #  acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(EN_IN_DIST ${account_DATA}
+set_dist_list(EN_IN_DIST ${account_DATA}
 #  acctchrt_full.gnucash-xea
   CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_IN)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/en_IN)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_IN)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/en_IN)
 

data/accounts/es_ES/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,7 +15,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(ES_ES_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(ES_ES_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_ES)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_ES)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_ES)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_ES)

data/accounts/es_MX/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,8 +15,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(ES_MX_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(ES_MX_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_MX)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/es_MX)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_MX)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/es_MX)
 

data/accounts/fi_FI/CMakeLists.txt

@@ -1,9 +1,9 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_common.gnucash-xea
   acctchrt_sbr-xbrl.gnucash-xea
   acctchrt_ry.gnucash-xea)
 
-SET_DIST_LIST(FI_FI_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(FI_FI_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fi_FI)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fi_FI)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fi_FI)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fi_FI)

data/accounts/fr_CA/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
  acctchrt_actifsfixes.gnucash-xea
  acctchrt_automobile.gnucash-xea
  acctchrt_basecommune.gnucash-xea
@@ -14,8 +14,8 @@ SET(account_DATA
  acctchrt_retraite.gnucash-xea
  acctchrt_revenus.gnucash-xea)
 
-SET_DIST_LIST(FR_CA_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(FR_CA_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CA)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CA)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CA)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CA)
 

data/accounts/fr_CH/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(FR_CH_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(FR_CH_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CH)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_CH)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CH)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_CH)

data/accounts/fr_FR/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(FR_FR_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(FR_FR_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_FR)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/fr_FR)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_FR)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/fr_FR)

data/accounts/hu_HU/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -17,8 +17,8 @@ SET(account_DATA
   acctchrt_spouseretire.gnucash-xea)
 
 
-SET_DIST_LIST(HU_HU_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(HU_HU_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/hu_HU)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/hu_HU)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/hu_HU)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/hu_HU)
 

data/accounts/it/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
  acctchrt_brokerage.gnucash-xea
  acctchrt_carloan.gnucash-xea
  acctchrt_checkbook.gnucash-xea
@@ -13,7 +13,7 @@ SET(account_DATA
  acctchrt_spouseinc.gnucash-xea
  acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(IT_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(IT_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/it)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/it)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/it)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/it)

data/accounts/ja/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -17,8 +17,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(JA_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(JA_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ja)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ja)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ja)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ja)
 

data/accounts/ko/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(KO_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(KO_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ko)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ko)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ko)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ko)

data/accounts/lt/CMakeLists.txt

@@ -1,6 +1,6 @@
-SET(account_DATA acctchrt_business.gnucash-xea)
+set(account_DATA acctchrt_business.gnucash-xea)
 
-SET_DIST_LIST(LT_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(LT_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lt)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lt)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lt)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lt)

data/accounts/lv/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(LV_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(LV_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lv)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/lv)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lv)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/lv)

data/accounts/nb/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
  acctchrt_brokerage.gnucash-xea
  acctchrt_business.gnucash-xea
  acctchrt_carloan.gnucash-xea
@@ -17,7 +17,7 @@ SET(account_DATA
  acctchrt_spouseinc.gnucash-xea
  acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(NB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(NB_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nb)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nb)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nb)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nb)

data/accounts/nl/CMakeLists.txt

@@ -1,9 +1,9 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_checkbook.gnucash-xea
   acctchrt_full.gnucash-xea
   acctchrt_rgs_1.1.gnucash-xea)
 
-SET_DIST_LIST(NL_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(NL_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nl)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/nl)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nl)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/nl)

data/accounts/pl/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(PL_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(PL_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pl)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pl)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pl)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pl)

data/accounts/pt_BR/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,8 +15,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(PT_BR_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(PT_BR_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_BR)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_BR)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_BR)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_BR)
 

data/accounts/pt_PT/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -14,8 +14,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(PT_PT_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(PT_PT_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_PT)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/pt_PT)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_PT)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/pt_PT)
 

data/accounts/ru/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_auto.gnucash-xea
   acctchrt_autoloan.gnucash-xea
   acctchrt_common.gnucash-xea
@@ -8,8 +8,8 @@ SET(account_DATA
   acctchrt_otherloan.gnucash-xea
   acctchrt_renter.gnucash-xea)
 
-SET_DIST_LIST(RU_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(RU_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ru)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/ru)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ru)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/ru)
 

data/accounts/sk/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_carloan.gnucash-xea
   acctchrt_cdmoneymkt.gnucash-xea
@@ -15,8 +15,8 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(SK_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(SK_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sk)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sk)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sk)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sk)
 

data/accounts/sv_AX/CMakeLists.txt

@@ -1,10 +1,10 @@
-SET(account_DATA
+set(account_DATA
     acctchrt_common.gnucash-xea
     acctchrt_sbr-xbrl.gnucash-xea
     acctchrt_rf.gnucash-xea)
 
-SET_DIST_LIST(SV_AX_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(SV_AX_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_AX)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_AX)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_AX)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_AX)
 

data/accounts/sv_FI/CMakeLists.txt

@@ -1,9 +1,9 @@
-SET(account_DATA
+set(account_DATA
     acctchrt_common.gnucash-xea
     acctchrt_sbr-xbrl.gnucash-xea
     acctchrt_rf.gnucash-xea)
 
-SET_DIST_LIST(SV_FI_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(SV_FI_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_FI)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_FI)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_FI)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_FI)

data/accounts/sv_SE/CMakeLists.txt

@@ -1,8 +1,8 @@
-SET(account_DATA
+set(account_DATA
 	bas_2012.gnucash-xea
 	acctchrt_common.gnucash-xea)
 
-SET_DIST_LIST(SV_SE_DIST ${account_DATA} README.bas_2012 CMakeLists.txt)
+set_dist_list(SV_SE_DIST ${account_DATA} README.bas_2012 CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_SE)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/sv_SE)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_SE)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/sv_SE)

data/accounts/tr_TR/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
  acctchrt_brokerage.gnucash-xea
  acctchrt_carloan.gnucash-xea
  acctchrt_cdmoneymkt.gnucash-xea
@@ -8,7 +8,7 @@ SET(account_DATA
  acctchrt_homeloan.gnucash-xea
  acctchrt_TEKDUZ.gnucash-xea)
 
-SET_DIST_LIST(TR_TR_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(TR_TR_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/tr_TR)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/tr_TR)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/tr_TR)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/tr_TR)

data/accounts/zh_CN/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(account_DATA
+set(account_DATA
   acctchrt_brokerage.gnucash-xea
   acctchrt_business.gnucash-xea
   acctchrt_carloan.gnucash-xea
@@ -16,7 +16,7 @@ SET(account_DATA
   acctchrt_spouseinc.gnucash-xea
   acctchrt_spouseretire.gnucash-xea)
 
-SET_DIST_LIST(ZH_CN_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
+set_dist_list(ZH_CN_DIST ${account_DATA} acctchrt_full.gnucash-xea CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_CN)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_CN)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zn_CN)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zn_CN)

data/accounts/zh_HK/CMakeLists.txt

@@ -1,6 +1,6 @@
-SET(account_DATA acctchrt_business.gnucash-xea)
+set(account_DATA acctchrt_business.gnucash-xea)
 
-SET_DIST_LIST(ZH_HK_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(ZH_HK_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_HK)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_HK)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_HK)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_HK)

data/accounts/zh_TW/CMakeLists.txt

@@ -1,6 +1,6 @@
-SET(account_DATA acctchrt_business.gnucash-xea)
+set(account_DATA acctchrt_business.gnucash-xea)
 
-SET_DIST_LIST(ZH_TW_DIST ${account_DATA} CMakeLists.txt)
+set_dist_list(ZH_TW_DIST ${account_DATA} CMakeLists.txt)
 
-INSTALL(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_TW)
+install(FILES ${account_DATA} DESTINATION ${ACCOUNTS_INSTALL_DIR}/zh_TW)
-FILE(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_TW)
+file(COPY ${account_DATA} DESTINATION ${ACCOUNTS_BUILD_DIR}/zh_TW)

data/checks/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(checks_DATA
+set(checks_DATA
   deluxe.chk
   liberty.chk
   quicken.chk
@@ -8,8 +8,8 @@ SET(checks_DATA
   quicken_3part.chk
 )
 
-INSTALL(FILES ${checks_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/checks)
+install(FILES ${checks_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash/checks)
 
-FILE(COPY ${checks_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/checks)
+file(COPY ${checks_DATA} DESTINATION ${DATADIR_BUILD}/gnucash/checks)
 
-SET_DIST_LIST(checks_DIST CMakeLists.txt ${checks_DATA})
+set_dist_list(checks_DIST CMakeLists.txt ${checks_DATA})

data/pixmaps/CMakeLists.txt

@@ -1,12 +1,12 @@
 
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_DATADIR}/gnucash
     PATTERN Makefile* EXCLUDE
     PATTERN CMake* EXCLUDE
     PATTERN CTest* EXCLUDE
     PATTERN cmake* EXCLUDE
     PATTERN hicolor EXCLUDE
 )
-FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}
     DESTINATION ${DATADIR_BUILD}/gnucash
     PATTERN Makefile* EXCLUDE
     PATTERN CMake* EXCLUDE
@@ -14,27 +14,27 @@ FILE(COPY ${CMAKE_CURRENT_SOURCE_DIR}
     PATTERN cmake* EXCLUDE
     PATTERN hicolor EXCLUDE
 )
-INSTALL(
+install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/icons
     REGEX ".*/apps.*" EXCLUDE
 )
-FILE(
+file(
     COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor
     DESTINATION ${DATADIR_BUILD}/gnucash/icons
     REGEX ".*/apps.*" EXCLUDE
 )
 
-INSTALL(
+install(
     DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor DESTINATION  ${CMAKE_INSTALL_DATADIR}/icons
     REGEX ".*/actions.*" EXCLUDE
 )
-FILE(
+file(
     COPY ${CMAKE_CURRENT_SOURCE_DIR}/hicolor
     DESTINATION ${DATADIR_BUILD}/icons
     REGEX ".*/actions.*" EXCLUDE
 )
 
-SET(gncpixmap_DATA
+set(gncpixmap_DATA
     hicolor/16x16/actions/gnc-account.png
     hicolor/24x24/actions/gnc-account.png
     hicolor/16x16/actions/gnc-account-delete.png
@@ -76,7 +76,7 @@ SET(gncpixmap_DATA
     gnucash_splash.png
 )
 
-SET(gncicon_DATA
+set(gncicon_DATA
     hicolor/16x16/apps/gnucash-icon.png
     hicolor/22x22/apps/gnucash-icon.png
     hicolor/24x24/apps/gnucash-icon.png
@@ -88,10 +88,10 @@ SET(gncicon_DATA
     hicolor/256x256/apps/gnucash-icon.png
 )
 
-SET(gncscalableicon_DATA
+set(gncscalableicon_DATA
     hicolor/scalable/apps/gnucash-icon.svg
 )
 
-SET_LOCAL_DIST(pixmaps_DIST_local CMakeLists.txt ${gncpixmap_DATA}
+set_local_dist(pixmaps_DIST_local CMakeLists.txt ${gncpixmap_DATA}
     ${gncicon_DATA} ${gncscalableicon_DATA})
-SET(pixmaps_DIST ${pixmaps_DIST_local} PARENT_SCOPE)
+set(pixmaps_DIST ${pixmaps_DIST_local} PARENT_SCOPE)

doc/CMakeLists.txt

@@ -1,6 +1,6 @@
-ADD_SUBDIRECTORY(examples)
+add_subdirectory(examples)
 
-SET(doc_DATA
+set(doc_DATA
   README.francais
   README.german
   README-ca.win32-bin.txt
@@ -17,63 +17,63 @@ SET(doc_DATA
   gtk-3.0.css
 )
 
-SET(doc_noinst_DATA
+set(doc_noinst_DATA
         build-aix.txt build-solaris.txt CMakeLists.txt gnc-fq-dump.1 gnc-fq-helper.1 gnucash.1.in
         misc-notes.txt README.HBCI README.OFX README.translator.txt tip_of_the_day.list.c
         TRANSLATION_HOWTO)
 
-INSTALL(FILES ${doc_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
+install(FILES ${doc_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
 
-SET_LOCAL_DIST(doc_DIST_local ${doc_DATA} ${doc_noinst_DATA})
+set_local_dist(doc_DIST_local ${doc_DATA} ${doc_noinst_DATA})
-SET(doc_DIST ${doc_DIST_local} ${examples_DIST} PARENT_SCOPE)
+set(doc_DIST ${doc_DIST_local} ${examples_DIST} PARENT_SCOPE)
 
-FILE(COPY ${doc_DATA} DESTINATION ${DATADIR_BUILD}/doc/gnucash)
+file(COPY ${doc_DATA} DESTINATION ${DATADIR_BUILD}/doc/gnucash)
 
 # Generate the tip of the day file.
 
-EXECUTE_PROCESS(
+execute_process(
     COMMAND ${CMAKE_C_COMPILER} -E -P -x c -DN_\(x\)=x -o ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp ${CMAKE_CURRENT_SOURCE_DIR}/tip_of_the_day.list.c
 )
 
-FILE(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES)
+file(STRINGS ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list.tmp TIP_OF_THE_DAY_LINES)
 
-SET(TOTD_OUTPUT "")
+set(TOTD_OUTPUT "")
-FOREACH(line ${TIP_OF_THE_DAY_LINES})
+foreach(line ${TIP_OF_THE_DAY_LINES})
-  STRING(REGEX REPLACE "^ *\"" "" line2 "${line}")
+  string(REGEX REPLACE "^ *\"" "" line2 "${line}")
-  STRING(REGEX REPLACE "\" *$" "" line3 "${line2}")
+  string(REGEX REPLACE "\" *$" "" line3 "${line2}")
-  LIST(APPEND TOTD_OUTPUT "${line3}\n")
+  list(APPEND TOTD_OUTPUT "${line3}\n")
-ENDFOREACH()
+endforeach()
 
-STRING(CONCAT FINAL_TOTD ${TOTD_OUTPUT})
+string(CONCAT FINAL_TOTD ${TOTD_OUTPUT})
 
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list "${FINAL_TOTD}")
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list "${FINAL_TOTD}")
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash)
 
-FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}/tip_of_the_day.list
   DESTINATION ${DATADIR_BUILD}/gnucash)
 
 # ---
-IF (BUILDING_FROM_VCS)
+if (BUILDING_FROM_VCS)
-  SET(VCS_INFO_BASE_DIR ${CMAKE_BINARY_DIR})
+  set(VCS_INFO_BASE_DIR ${CMAKE_BINARY_DIR})
-ELSE()
+else()
-  SET(VCS_INFO_BASE_DIR ${CMAKE_SOURCE_DIR})
+  set(VCS_INFO_BASE_DIR ${CMAKE_SOURCE_DIR})
-ENDIF()
+endif()
-SET(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h)
+set(VCS_INFO_FILE ${VCS_INFO_BASE_DIR}/libgnucash/core-utils/gnc-vcs-info.h)
 
 # The copious use of backslashes below is to escape escape sequences that
 # have to end up in the file being written...
 # eg \\\" will become \", \\\\1 will become \\1 (which cmake will then interpret as \1)
-FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/manpage.cmake
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/manpage.cmake
-"FILE(STRINGS \${VCS_INFO_FILE} ym_line REGEX \"GNC_VCS_REV_Y_M\")
+"file(STRINGS \${VCS_INFO_FILE} ym_line REGEX \"GNC_VCS_REV_Y_M\")
-STRING(REGEX REPLACE \"^.* \\\"(.*)\\\"\" \"\\\\1\" DATE \${ym_line})
+string(REGEX REPLACE \"^.* \\\"(.*)\\\"\" \"\\\\1\" DATE \${ym_line})
-CONFIGURE_FILE(\${SRC} \${DST} )
+configure_file(\${SRC} \${DST} )
-FILE(COPY gnucash.1
+file(COPY gnucash.1
   DESTINATION \${DATADIR_BUILD}/gnucash)
 ")
 
 
-ADD_CUSTOM_COMMAND(OUTPUT gnucash.1
+add_custom_command(OUTPUT gnucash.1
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in gnc-vcs-info
   COMMAND ${CMAKE_COMMAND} -D SRC=${CMAKE_CURRENT_SOURCE_DIR}/gnucash.1.in
                            -D DST=gnucash.1
@@ -82,7 +82,7 @@ ADD_CUSTOM_COMMAND(OUTPUT gnucash.1
                            -D DATADIR_BUILD=${DATADIR_BUILD}
                            -P ${CMAKE_CURRENT_BINARY_DIR}/manpage.cmake
   )
-ADD_CUSTOM_TARGET(gnucash-manpage DEPENDS gnucash.1)
+add_custom_target(gnucash-manpage DEPENDS gnucash.1)
 dist_add_generated (${BUILDING_FROM_VCS} gnucash.1)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.1 DESTINATION  ${CMAKE_INSTALL_MANDIR}/man1)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.1 DESTINATION  ${CMAKE_INSTALL_MANDIR}/man1)

doc/examples/CMakeLists.txt

@@ -1,6 +1,6 @@
 
 
-SET(examples_DATA
+set(examples_DATA
   Money95bank_fr.qif
   Money95invst_fr.qif
   Money95mfunds_fr.qif
@@ -21,6 +21,6 @@ SET(examples_DATA
   web.qif
 )
 
-INSTALL(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
+install(FILES ${examples_DATA} DESTINATION  ${CMAKE_INSTALL_DOCDIR})
 
-SET_DIST_LIST(examples_DIST ${examples_DATA} CMakeLists.txt )
+set_dist_list(examples_DIST ${examples_DATA} CMakeLists.txt )

gnucash/CMakeLists.txt

@@ -19,58 +19,58 @@ int main (int argc, char** argv) {
  have_mod_mask)
 
 # The subdirectories
-ADD_SUBDIRECTORY (gnome)
+add_subdirectory (gnome)
-ADD_SUBDIRECTORY (gnome-utils)
+add_subdirectory (gnome-utils)
-ADD_SUBDIRECTORY (gnome-search)
+add_subdirectory (gnome-search)
-ADD_SUBDIRECTORY (gtkbuilder)
+add_subdirectory (gtkbuilder)
-ADD_SUBDIRECTORY (html)
+add_subdirectory (html)
-ADD_SUBDIRECTORY (import-export)
+add_subdirectory (import-export)
-ADD_SUBDIRECTORY (python)
+add_subdirectory (python)
-ADD_SUBDIRECTORY (register)
+add_subdirectory (register)
-ADD_SUBDIRECTORY (report)
+add_subdirectory (report)
-ADD_SUBDIRECTORY (ui)
+add_subdirectory (ui)
-ADD_SUBDIRECTORY (gschemas)
+add_subdirectory (gschemas)
 
-ADD_DEFINITIONS (-DHAVE_CONFIG_H)
+add_definitions (-DHAVE_CONFIG_H)
 
 # Some settings are platform dependent. Let's define them per platform.
-IF (WIN32)
+if (WIN32)
     # Windows specific settings go here:
     set (GNUCASH_RESOURCE_FILE gnucash.rc)
     configure_file(gnucash.rc.in gnucash.rc @ONLY NEWLINE_STYLE WIN32)
 
-ELSE (WIN32)
+else (WIN32)
   # All other platforms use these settings:
-  SET (PLATFORM_FILES gnucash-valgrind)
+  set (PLATFORM_FILES gnucash-valgrind)
 
-ENDIF (WIN32)
+endif (WIN32)
 
-SET (gnucash_SOURCES
+set (gnucash_SOURCES
   gnucash-bin.c
   gnucash-gresources.c
   ${GNUCASH_RESOURCE_FILE}
 )
 
-ADD_EXECUTABLE (gnucash
+add_executable (gnucash
   ${gnucash_SOURCES}
 )
 
-ADD_DEPENDENCIES (gnucash gnucash-manpage)
+add_dependencies (gnucash gnucash-manpage)
 
-TARGET_COMPILE_DEFINITIONS(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
+target_compile_definitions(gnucash PRIVATE -DG_LOG_DOMAIN=\"gnc.bin\")
 
 if (BUILDING_FROM_VCS)
-  TARGET_COMPILE_DEFINITIONS(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
+  target_compile_definitions(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
 endif (BUILDING_FROM_VCS)
 
-TARGET_LINK_LIBRARIES (gnucash
+target_link_libraries (gnucash
    gncmod-ledger-core gncmod-report-gnome gnc-gnome gncmod-gnome-utils gncmod-app-utils
    gncmod-engine gnc-module gnc-core-utils gncmod-report-system
    ${GUILE_LDFLAGS} ${GLIB2_LDFLAGS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS}
 )
 
 # Get glib executable for generating the gresource file
-EXECUTE_PROCESS(
+execute_process(
    COMMAND
        ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_resources
    OUTPUT_VARIABLE
@@ -79,7 +79,7 @@ EXECUTE_PROCESS(
 )
 
 # Get the dependencies of the gresource
-EXECUTE_PROCESS(
+execute_process(
   OUTPUT_VARIABLE
       gr_files
   COMMAND ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
@@ -88,9 +88,9 @@ EXECUTE_PROCESS(
      ${CMAKE_CURRENT_SOURCE_DIR}/gnucash-gresources.xml
 )
 
-STRING (REPLACE "\n" ";" gresource_files ${gr_files})
+string (REPLACE "\n" ";" gresource_files ${gr_files})
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
    OUTPUT gnucash-gresources.c
    COMMAND
     ${GLIB_COMPILE_RESOURCES_EXECUTABLE}
@@ -104,161 +104,162 @@ ADD_CUSTOM_COMMAND(
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-IF (MAC_INTEGRATION)
+if (MAC_INTEGRATION)
-  TARGET_COMPILE_OPTIONS(gnucash PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+  target_compile_options(gnucash PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
-  TARGET_LINK_LIBRARIES(gnucash ${OSX_EXTRA_LIBRARIES})
+  target_link_libraries(gnucash ${OSX_EXTRA_LIBRARIES})
-ENDIF(MAC_INTEGRATION)
+endif(MAC_INTEGRATION)
 
-INSTALL(TARGETS gnucash DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(TARGETS gnucash DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
 
-SET(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
+set(TOP_SRC_DIR ${CMAKE_SOURCE_DIR})
-SET(GNUCASH_BIN_INSTALL_NAME "gnucash")
+set(GNUCASH_BIN_INSTALL_NAME "gnucash")
 
-SET(VALGRIND_OUTDIR ${BINDIR_BUILD})
+set(VALGRIND_OUTDIR ${BINDIR_BUILD})
 
 configure_file(gnucash-valgrind.in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind @ONLY)
 
-FILE(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind
+file(COPY ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/gnucash-valgrind
           DESTINATION ${VALGRIND_OUTDIR}
           FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
 ## Create the environment file
 
-FILE(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN)
+file(STRINGS ${CMAKE_CURRENT_SOURCE_DIR}/environment.in ENV_STRINGS_IN)
 
-SET(ENV_STRINGS_LIST "")
+set(ENV_STRINGS_LIST "")
 
-FOREACH(line ${ENV_STRINGS_IN})
+foreach(line ${ENV_STRINGS_IN})
-  STRING(REPLACE ";" "\;" line2 "${line}")
+  string(REPLACE ";" "\;" line2 "${line}")
-  IF(NOT "${line2}" MATCHES "@NOTE")
+  if(NOT "${line2}" MATCHES "@NOTE")
-    LIST(APPEND ENV_STRINGS_LIST "${line2}\n")
+    list(APPEND ENV_STRINGS_LIST "${line2}\n")
-  ENDIF()
+  endif()
-ENDFOREACH()
+endforeach()
 
-STRING(CONCAT ENV_STRINGS ${ENV_STRINGS_LIST})
+string(CONCAT ENV_STRINGS ${ENV_STRINGS_LIST})
-STRING(CONFIGURE "${ENV_STRINGS}" ENV_STRINGS_CONF @ONLY)
+string(CONFIGURE "${ENV_STRINGS}" ENV_STRINGS_CONF @ONLY)
 
-SET(ENV_FILE_OUT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/environment)
+set(ENV_FILE_OUT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/environment)
-SET(BUILD_ENV_FILE_OUT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/environment.build)
+set(BUILD_ENV_FILE_OUT ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/environment.build)
 
-FILE(WRITE ${ENV_FILE_OUT} "${ENV_STRINGS_CONF}")
+file(WRITE ${ENV_FILE_OUT} "${ENV_STRINGS_CONF}")
-FILE(WRITE ${BUILD_ENV_FILE_OUT} "${ENV_STRINGS_CONF}")
+file(WRITE ${BUILD_ENV_FILE_OUT} "${ENV_STRINGS_CONF}")
 
-SET(XDG_TEXT "
+set(XDG_TEXT "
 # GnuCash was not installed in the default location.
 # XDG_DATA_DIRS will be set so that our documentation
 # and gsettings schema are found.\n"
 )
 
-IF (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
+if (NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/share") AND NOT(${CMAKE_INSTALL_FULL_DATADIR} STREQUAL "/usr/local/share"))
-  FILE(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
+  file(APPEND ${ENV_FILE_OUT} ${XDG_TEXT})
-  FILE(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
+  file(APPEND ${ENV_FILE_OUT} "XDG_DATA_DIRS={GNC_HOME}/share;{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
-ENDIF()
+endif()
-FILE(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
+file(APPEND ${BUILD_ENV_FILE_OUT} ${XDG_TEXT})
-FILE(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
+file(APPEND ${BUILD_ENV_FILE_OUT} "XDG_DATA_DIRS=${DATADIR_BUILD};{XDG_DATA_DIRS};" "${GNC_SYSTEM_XDG_DATA_DIRS}\n")
 
 if (LIBDBI_LIBRARY AND LIBDBI_DRIVERS_DIR)
   get_filename_component(libdir ${LIBDBI_LIBRARY} DIRECTORY)
   string(FIND ${LIBDBI_DRIVERS_DIR} ${libdir} is_subdir)
   if (NOT is_subdir EQUAL 0)
-    FILE(APPEND ${BUILD_ENV_FILE_OUT} "GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}")
+    file(APPEND ${BUILD_ENV_FILE_OUT} "GNC_DBD_DIR=${LIBDBI_DRIVERS_DIR}")
+  endif()
 endif()
-ENDIF()
 
-IF (WITH_PYTHON)
+if (WITH_PYTHON)
-  SET(PYTHON_TEXT "
+  set(PYTHON_TEXT "
 # Define PYTHONPATH for non default installation path.\n"
  )
-  IF (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
+  if (NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr") AND NOT(${CMAKE_INSTALL_PREFIX} STREQUAL "/usr/local"))
 
-    FILE(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
+    file(APPEND ${ENV_FILE_OUT} ${PYTHON_TEXT})
-    FILE(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}\n")
+    file(APPEND ${ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_OUTPUT};{PYTHONPATH}\n")
-  ENDIF()
+  endif()
 
-  FILE(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
+  file(APPEND ${BUILD_ENV_FILE_OUT} ${PYTHON_TEXT})
-  FILE(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}\n")
+  file(APPEND ${BUILD_ENV_FILE_OUT} "PYTHONPATH=${PYTHON_SYSCONFIG_BUILD};{PYTHONPATH}\n")
-ENDIF()
+endif()
 
-IF (MAC_INTEGRATION)
+if (MAC_INTEGRATION)
   file(APPEND ${ENV_FILE_OUT} "XDG_CONFIG_HOME={HOME}/Library/Application Support/Gnucash/config\n")
   file(APPEND ${ENV_FILE_OUT} "GDK_PIXBUF_MODULE_FILE={SYS_LIB}/gdk-pixbuf-2.0/2.10.0/loaders.cache\n")
   file(APPEND ${ENV_FILE_OUT} "FONTCONFIG_FILE={GNC_HOME}/etc/fonts/fonts.conf\n")
   file(APPEND ${ENV_FILE_OUT} "OFX_DTD_PATH={GNC_HOME}/share/libofx/dtd\n")
-ENDIF()
+  file(APPEND ${ENV_FILE_OUT} "GNC_DBD_DIR={SYS_LIB}/dbd\n")
+endif()
 
-FILE(COPY ${BUILD_ENV_FILE_OUT}
+file(COPY ${BUILD_ENV_FILE_OUT}
   DESTINATION ${SYSCONFDIR_BUILD}/gnucash
   FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
-FILE(RENAME
+file(RENAME
   ${SYSCONFDIR_BUILD}/gnucash/environment.build
   ${SYSCONFDIR_BUILD}/gnucash/environment
 )
 
-SET(ENVIRONMENT_FILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
+set(ENVIRONMENT_FILE_DIR ${CMAKE_CURRENT_BINARY_DIR})
-FILE(COPY ${ENV_FILE_OUT}
+file(COPY ${ENV_FILE_OUT}
   DESTINATION ${ENVIRONMENT_FILE_DIR}
   FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE
 )
 
-INSTALL(FILES ${SCRIPT_LIST} ${VALGRIND_OUTDIR}/gnucash-valgrind DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES ${SCRIPT_LIST} ${VALGRIND_OUTDIR}/gnucash-valgrind DESTINATION ${CMAKE_INSTALL_BINDIR})
-INSTALL(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION
+install(FILES ${ENVIRONMENT_FILE_DIR}/environment DESTINATION
   ${CMAKE_INSTALL_FULL_SYSCONFDIR}/gnucash)
 
-IF (WIN32)
+if (WIN32)
   # Write out a command script for windows
-  SET(lib_directories boost enchant libsoup mysql pgsql libxslt)
+  set(lib_directories boost enchant libsoup mysql pgsql libxslt)
-  SET(bin_directories mingw gnutls libgsf pcre gnome guile webkit regex aqbanking gwenhywfar libofx opensp
+  set(bin_directories mingw gnutls libgsf pcre gnome guile webkit regex aqbanking gwenhywfar libofx opensp
     libdbi sqlite3 mysql pgsql enchant libsoup libxslt)
 
-  SET(CMD_LINES "")
+  set(CMD_LINES "")
-  SET(BUILD_CMD_LINES "")
+  set(BUILD_CMD_LINES "")
-  FOREACH(dir bin lib lib/gnucash)
+  foreach(dir bin lib lib/gnucash)
-    FILE(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${dir} INSTALL_PATH_ITEM)
+    file(TO_NATIVE_PATH ${CMAKE_INSTALL_PREFIX}/${dir} INSTALL_PATH_ITEM)
-    FILE(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/${dir} BUILD_PATH_ITEM)
+    file(TO_NATIVE_PATH ${CMAKE_BINARY_DIR}/${dir} BUILD_PATH_ITEM)
-    LIST(APPEND CMD_LINES "set PATH=${INSTALL_PATH_ITEM}\;%PATH%\n")
+    list(APPEND CMD_LINES "set PATH=${INSTALL_PATH_ITEM}\;%PATH%\n")
-    LIST(APPEND BUILD_CMD_LINES "set PATH=${BUILD_PATH_ITEM}\;%PATH%\n")
+    list(APPEND BUILD_CMD_LINES "set PATH=${BUILD_PATH_ITEM}\;%PATH%\n")
-  ENDFOREACH(dir)
+  endforeach(dir)
-  IF (NOT ${MINGW64})
+  if (NOT ${MINGW64})
-    FOREACH(dir ${lib_directories})
+    foreach(dir ${lib_directories})
-      FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/lib PATH_ITEM)
+      file(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/lib PATH_ITEM)
-      LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
+      list(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
-    ENDFOREACH(dir)
+    endforeach(dir)
 
-    FOREACH(dir ${bin_directories})
+    foreach(dir ${bin_directories})
-      FILE(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/bin PATH_ITEM)
+      file(TO_NATIVE_PATH ${CMAKE_PREFIX_PATH}/${dir}/bin PATH_ITEM)
-      LIST(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
+      list(APPEND CMD_LINES "set PATH=${PATH_ITEM}\;%PATH%\n")
-    ENDFOREACH(dir)
+    endforeach(dir)
-  ENDIF (NOT ${MINGW64})
+  endif (NOT ${MINGW64})
-  SET(CMD_FILE ${CMAKE_CURRENT_BINARY_DIR}/gnucash-launcher.cmd)
+  set(CMD_FILE ${CMAKE_CURRENT_BINARY_DIR}/gnucash-launcher.cmd)
-  FILE(WRITE ${CMD_FILE} "@echo off\nsetlocal\n\n")
+  file(WRITE ${CMD_FILE} "@echo off\nsetlocal\n\n")
-  FOREACH(line ${CMD_LINES})
+  foreach(line ${CMD_LINES})
-    FILE(APPEND ${CMD_FILE} "${line}")
+    file(APPEND ${CMD_FILE} "${line}")
-  ENDFOREACH(line)
+  endforeach(line)
-  FILE(APPEND ${CMD_FILE} "\nstart gnucash %*\n")
+  file(APPEND ${CMD_FILE} "\nstart gnucash %*\n")
 
-  SET(BUILD_CMD_FILE ${CMAKE_BINARY_DIR}/bin/gnucash-launcher.cmd)
+  set(BUILD_CMD_FILE ${CMAKE_BINARY_DIR}/bin/gnucash-launcher.cmd)
-  FILE(WRITE ${BUILD_CMD_FILE} "@echo off\nsetlocal\n\n")
+  file(WRITE ${BUILD_CMD_FILE} "@echo off\nsetlocal\n\n")
-  FOREACH(line ${CMD_LINES})
+  foreach(line ${CMD_LINES})
-     FILE(APPEND ${BUILD_CMD_FILE} "${line}")
+     file(APPEND ${BUILD_CMD_FILE} "${line}")
-  ENDFOREACH(line)
+  endforeach(line)
-  FILE(APPEND ${BUILD_CMD_FILE} "\nstart gnucash %*\n")
+  file(APPEND ${BUILD_CMD_FILE} "\nstart gnucash %*\n")
 
-  INSTALL(PROGRAMS ${CMD_FILE} DESTINATION  ${CMAKE_INSTALL_BINDIR})
+  install(PROGRAMS ${CMD_FILE} DESTINATION  ${CMAKE_INSTALL_BINDIR})
-ENDIF(WIN32)
+endif(WIN32)
 
-# The GResource Files are absolute paths but SET_LOCAL_DIST requires
+# The GResource Files are absolute paths but set_local_dist requires
 # relative paths.
-FOREACH(gres_file ${gresource_files})
+foreach(gres_file ${gresource_files})
-  FILE(RELATIVE_PATH rel_file ${CMAKE_CURRENT_SOURCE_DIR} ${gres_file})
+  file(RELATIVE_PATH rel_file ${CMAKE_CURRENT_SOURCE_DIR} ${gres_file})
-  LIST(REMOVE_ITEM gresource_files ${gres_file})
+  list(REMOVE_ITEM gresource_files ${gres_file})
-  LIST(APPEND gresource_files ${rel_file})
+  list(APPEND gresource_files ${rel_file})
-ENDFOREACH()
+endforeach()
 
-SET_LOCAL_DIST(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
+set_local_dist(gnucash_DIST_local CMakeLists.txt environment.in generate-gnc-script
                gnucash-bin.c gnucash.rc.in gnucash-valgrind.in gnucash-gresources.xml ${gresource_files}
                ${gnucash_EXTRA_DIST})
 

gnucash/gnome-search/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET (gnome_search_SOURCES
+set (gnome_search_SOURCES
   gncmod-gnome-search.c
   gnc-general-search.c
   dialog-search.c
@@ -15,12 +15,12 @@ SET (gnome_search_SOURCES
   search-string.c
 )
 
-SET (gnome_search_HEADERS
+set (gnome_search_HEADERS
   dialog-search.h
   gnc-general-search.h
 )
 
-SET (gnome_search_noinst_HEADERS
+set (gnome_search_noinst_HEADERS
   search-account.h
   search-boolean.h
   search-core-type.h
@@ -34,31 +34,31 @@ SET (gnome_search_noinst_HEADERS
 )  
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${gnome_search_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET_LOCAL_DIST(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${gnome_search_HEADERS}
+set_local_dist(gnome_search_DIST_local CMakeLists.txt ${gnome_search_SOURCES} ${gnome_search_HEADERS}
         ${gnome_search_noinst_HEADERS})
-SET(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
+set(gnome_search_DIST ${gnome_search_DIST_local} PARENT_SCOPE)
 
-ADD_LIBRARY (gncmod-gnome-search
+add_library (gncmod-gnome-search
     ${gnome_search_SOURCES}
     ${gnome_search_HEADERS}
     ${gnome_search_noinst_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-gnome-search gncmod-gnome-utils ${GTK3_LDFLAGS})
+target_link_libraries(gncmod-gnome-search gncmod-gnome-utils ${GTK3_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")
+target_compile_definitions(gncmod-gnome-search PRIVATE -DG_LOG_DOMAIN=\"gnc.gui.search\")
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(gncmod-gnome-search PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-gnome-search PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-gnome-search
+install(TARGETS gncmod-gnome-search
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-INSTALL(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+install(FILES ${gnome_search_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)

gnucash/gnome-utils/CMakeLists.txt

@@ -1,6 +1,6 @@
 # Note that gnucash/gnome-utils CANNOT depend on gnucash/gnome!
 
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
 # Command to generate the swig-gnome-utils.c wrapper file
 gnc_add_swig_guile_command (swig-gnome-utils-c
@@ -8,17 +8,17 @@ gnc_add_swig_guile_command (swig-gnome-utils-c
     ${CMAKE_CURRENT_SOURCE_DIR}/gnome-utils.i
 )
 
-SET (WARNINGS_SCHEMA ${DATADIR_BUILD}/glib-2.0/schemas/org.gnucash.warnings.gschema.xml)
+set (WARNINGS_SCHEMA ${DATADIR_BUILD}/glib-2.0/schemas/org.gnucash.warnings.gschema.xml)
-SET (GNC_WARNINGS_C ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.c)
+set (GNC_WARNINGS_C ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.c)
-SET (GNC_WARNINGS_H ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.h)
+set (GNC_WARNINGS_H ${CMAKE_CURRENT_BINARY_DIR}/gnc-warnings.h)
 
-ADD_CUSTOM_COMMAND(
+add_custom_command(
   OUTPUT ${GNC_WARNINGS_C}
   DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-c.xsl
   COMMAND
     ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_C} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-c.xsl ${WARNINGS_SCHEMA}
 )
-ADD_CUSTOM_COMMAND(
+add_custom_command(
   OUTPUT ${GNC_WARNINGS_H}
   DEPENDS ${WARNINGS_SCHEMA} make-gnc-warnings-h.xsl
   COMMAND
@@ -34,7 +34,7 @@ else (MAC_INTEGRATION)
 endif (MAC_INTEGRATION)
 endif (NOT have_mod_mask)
 
-SET (gnome_utils_SOURCES
+set (gnome_utils_SOURCES
   account-quickfill.c
   assistant-xml-encoding.c
   cursors.c
@@ -117,7 +117,7 @@ SET (gnome_utils_SOURCES
   window-main-summarybar.c
 )
 
-SET(gnome_utils_noinst_HEADERS
+set(gnome_utils_noinst_HEADERS
   dialog-tax-table.h
   gnc-autosave.h
   gnc-gobject-utils.h
@@ -125,7 +125,7 @@ SET(gnome_utils_noinst_HEADERS
   search-param.h
 )
 
-SET (gnome_utils_HEADERS
+set (gnome_utils_HEADERS
   account-quickfill.h
   assistant-xml-encoding.h
   dialog-account.h
@@ -203,7 +203,7 @@ SET (gnome_utils_HEADERS
 
 
 
-ADD_LIBRARY (gncmod-gnome-utils
+add_library (gncmod-gnome-utils
   ${gnome_utils_SOURCES}
   ${gnome_utils_HEADERS}
   ${GNC_WARNINGS_C} ${GNC_WARNINGS_H}
@@ -211,22 +211,22 @@ ADD_LIBRARY (gncmod-gnome-utils
   ${gnome_utils_noinst_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-gnome-utils gncmod-app-utils gncmod-engine gnc-backend-xml-utils
+target_link_libraries(gncmod-gnome-utils gncmod-app-utils gncmod-engine gnc-backend-xml-utils
      ${CMAKE_DL_LIBS} ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
+target_compile_definitions(gncmod-gnome-utils PUBLIC ${GTK_MAC_CFLAGS_OTHER}
   PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\")
 
 if (BUILDING_FROM_VCS)
-  TARGET_COMPILE_DEFINITIONS(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
+  target_compile_definitions(gncmod-gnome-utils PRIVATE -DGNC_VCS=\"git\")
 endif (BUILDING_FROM_VCS)
 
-IF (MAC_INTEGRATION)
+if (MAC_INTEGRATION)
-  TARGET_COMPILE_OPTIONS(gncmod-gnome-utils PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+  target_compile_options(gncmod-gnome-utils PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
-  TARGET_LINK_LIBRARIES(gncmod-gnome-utils ${OSX_EXTRA_LIBRARIES})
+  target_link_libraries(gncmod-gnome-utils ${OSX_EXTRA_LIBRARIES})
-ENDIF(MAC_INTEGRATION)
+endif(MAC_INTEGRATION)
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils
+target_include_directories(gncmod-gnome-utils
     PUBLIC
       ${GTK3_INCLUDE_DIRS}
       ${CMAKE_CURRENT_SOURCE_DIR}
@@ -236,23 +236,23 @@ TARGET_INCLUDE_DIRECTORIES(gncmod-gnome-utils
 )
 
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-gnome-utils PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-gnome-utils
+install(TARGETS gncmod-gnome-utils
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-INSTALL(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+install(FILES ${gnome_utils_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
 
 # Scheme
 
-SET(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-scm scm-app-utils)
+set(GUILE_DEPENDS      gncmod-gnome-utils scm-gnc-module scm-scm scm-app-utils)
 
-GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
+gnc_add_scheme_targets(scm-gnome-utils-1
   gnome-utils.scm
   gnucash
   "${GUILE_DEPENDS}"
@@ -260,16 +260,16 @@ GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-1
 )
 
 
-GNC_ADD_SCHEME_TARGETS(scm-gnome-utils-2
+gnc_add_scheme_targets(scm-gnome-utils-2
   gnc-menu-extensions.scm
   ""
   "${GUILE_DEPENDS}"
   FALSE
 )
 
-ADD_CUSTOM_TARGET(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-1)
+add_custom_target(scm-gnome-utils ALL DEPENDS scm-gnome-utils-2 scm-gnome-utils-1)
 
-SET_LOCAL_DIST(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS}
+set_local_dist(gnome_utils_DIST_local CMakeLists.txt ${gnome_utils_SOURCES} ${gnome_utils_HEADERS}
         ${gnome_utils_noinst_HEADERS} gnome-utils.scm gnome-utils.i gnc-menu-extensions.scm
         make-gnc-warnings-c.xsl make-gnc-warnings-h.xsl)
-SET(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST} PARENT_SCOPE)
+set(gnome_utils_DIST ${gnome_utils_DIST_local} ${test_gnome_utils_DIST} PARENT_SCOPE)

gnucash/gnome-utils/test/CMakeLists.txt

@@ -1,33 +1,33 @@
 
-SET(GNOME_UTILS_TEST_INCLUDE_DIRS
+set(GNOME_UTILS_TEST_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/libgnucash/gnc-module
   ${GLIB2_INCLUDE_DIRS}
   ${GUILE_INCLUDE_DIRS}
 )
-SET(GNOME_UTILS_TEST_LIBS gnc-module test-core)
+set(GNOME_UTILS_TEST_LIBS gnc-module test-core)
 
-GNC_ADD_TEST_WITH_GUILE(test-link-module-gnome-utils test-link-module.c
+gnc_add_test_with_guile(test-link-module-gnome-utils test-link-module.c
   GNOME_UTILS_TEST_INCLUDE_DIRS GNOME_UTILS_TEST_LIBS
 )
 
 
-SET(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
+set(GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
   ${GNOME_UTILS_TEST_INCLUDE_DIRS}
   ${CMAKE_BINARY_DIR}/common
   ${CMAKE_SOURCE_DIR}/gnucash/gnome-utils
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
   ${GTK3_INCLUDE_DIRS}
 )
-SET(GNOME_UTILS_GUI_TEST_LIBS
+set(GNOME_UTILS_GUI_TEST_LIBS
   ${GNOME_UTILS_TEST_LIBS}
   gncmod-gnome-utils
 )
 #This is a GUI test
-#GNC_ADD_TEST(test-gnc-recurrence test-gnc-recurrence.c
+#gnc_add_test(test-gnc-recurrence test-gnc-recurrence.c
 #  GNOME_UTILS_GUI_TEST_INCLUDE_DIRS
 #  GNOME_UTILS_GUI_TEST_LIBS
 #
-SET(GUILE_DEPENDS
+set(GUILE_DEPENDS
   scm-gnc-module
   scm-gnome-utils
   test-core
@@ -37,14 +37,14 @@ SET(GUILE_DEPENDS
   gncmod-engine
 )
 
-GNC_ADD_SCHEME_TARGETS(scm-test-load-gnome-utils-module
+gnc_add_scheme_targets(scm-test-load-gnome-utils-module
   "test-load-gnome-utils-module.scm"
   "gnucash/reports"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
-GNC_ADD_SCHEME_TESTS(test-load-gnome-utils-module.scm)
+gnc_add_scheme_tests(test-load-gnome-utils-module.scm)
 
 
-SET_DIST_LIST(test_gnome_utils_DIST CMakeLists.txt test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm)
+set_dist_list(test_gnome_utils_DIST CMakeLists.txt test-gnc-recurrence.c test-link-module.c test-load-gnome-utils-module.scm)

gnucash/gnome/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET (gnc_gnome_noinst_HEADERS
+set (gnc_gnome_noinst_HEADERS
   assistant-acct-period.h
   assistant-hierarchy.h
   assistant-loan.h
@@ -61,8 +61,7 @@ gnc_add_swig_guile_command (swig-gnome-c
     ${CMAKE_CURRENT_SOURCE_DIR}/gnome.i ${gnc_gnome_HEADERS}
 )
 
-SET (gnc_gnome_SOURCES 
+set (gnc_gnome_SOURCES
-
   assistant-acct-period.c
   assistant-hierarchy.c
   assistant-loan.c
@@ -122,19 +121,19 @@ SET (gnc_gnome_SOURCES
   window-autoclear.c
 )
 
-SET_SOURCE_FILES_PROPERTIES (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${gnc_gnome_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-IF (WIN32)
+if (WIN32)
-  SET (gnc_gnome_SOURCES ${gnc_gnome_SOURCES} ${CMAKE_SOURCE_DIR}/borrowed/libc/strfmon.c)
+  set (gnc_gnome_SOURCES ${gnc_gnome_SOURCES} ${CMAKE_SOURCE_DIR}/borrowed/libc/strfmon.c)
-ENDIF(WIN32)
+endif(WIN32)
 
-ADD_LIBRARY (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
+add_library (gnc-gnome ${gnc_gnome_SOURCES} ${gnc_gnome_noinst_HEADERS} ${SWIG_GNOME_C})
-TARGET_LINK_LIBRARIES(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-report-gnome gncmod-report-system
+target_link_libraries(gnc-gnome gncmod-gnome-search gncmod-ledger-core gncmod-report-gnome gncmod-report-system
     gncmod-register-gnome gncmod-register-core gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GTK_MAC_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
+target_compile_definitions (gnc-gnome PRIVATE -DG_LOG_DOMAIN=\"gnc.gui\" ${GTK_MAC_CFLAGS_OTHER})
 
-TARGET_INCLUDE_DIRECTORIES(gnc-gnome
+target_include_directories(gnc-gnome
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE
     ${CMAKE_SOURCE_DIR}/libgnucash/app-utils/calculation
@@ -144,13 +143,13 @@ TARGET_INCLUDE_DIRECTORIES(gnc-gnome
 
 add_dependencies (gnc-gnome swig-runtime-h)
 
-IF (MAC_INTEGRATION)
+if (MAC_INTEGRATION)
-  TARGET_COMPILE_OPTIONS(gnc-gnome PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
+  target_compile_options(gnc-gnome PRIVATE ${OSX_EXTRA_COMPILE_FLAGS})
-  TARGET_LINK_LIBRARIES(gnc-gnome ${OSX_EXTRA_LIBRARIES})
+  target_link_libraries(gnc-gnome ${OSX_EXTRA_LIBRARIES})
-ENDIF(MAC_INTEGRATION)
+endif(MAC_INTEGRATION)
 
 
-INSTALL(TARGETS gnc-gnome
+install(TARGETS gnc-gnome
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -159,10 +158,10 @@ INSTALL(TARGETS gnc-gnome
 
 # FIXME: where does LC_ALL=C come from?
 
-SET(CMAKE_COMMAND_TMP "")
+set(CMAKE_COMMAND_TMP "")
-IF (${CMAKE_VERSION} VERSION_GREATER 3.1)
+if (${CMAKE_VERSION} VERSION_GREATER 3.1)
-  SET(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
+  set(CMAKE_COMMAND_TMP ${CMAKE_COMMAND} -E env)
-ENDIF()
+endif()
 
 
 if (${GETTEXT_VERSION_STRING} VERSION_LESS 0.19.6)
@@ -183,9 +182,9 @@ else()
     )
 endif()
 
-ADD_CUSTOM_TARGET(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml)
+add_custom_target(gnucash-appdata ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION  ${CMAKE_INSTALL_DATADIR}/appdata)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.appdata.xml DESTINATION  ${CMAKE_INSTALL_DATADIR}/appdata)
 
 #=======
 
@@ -209,10 +208,10 @@ else()
     )
 endif()
 
-ADD_CUSTOM_TARGET(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop)
+add_custom_target(gnucash-desktop ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop)
 
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/gnucash.desktop DESTINATION  ${CMAKE_INSTALL_DATADIR}/applications)
 
-SET_DIST_LIST(gnome_DIST
+set_dist_list(gnome_DIST
         CMakeLists.txt gnome.i gnucash.appdata.xml.in gnucash.desktop.in.in
         ${gnc_gnome_noinst_HEADERS} ${gnc_gnome_SOURCES})

gnucash/gnome/dialog-invoice.c

@@ -2999,7 +2999,7 @@ static void
 multi_print_invoice_one (gpointer data, gpointer user_data)
 {
     struct multi_edit_invoice_data *meid = user_data;
-    print_one_invoice_cb (meid->parent, data, meid->user_data);
+    print_one_invoice_cb (gnc_ui_get_main_window (GTK_WIDGET(meid->parent)), data, meid->user_data);
 }
 
 static void

gnucash/gschemas/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET(gschema_SOURCES
+set(gschema_SOURCES
   org.gnucash.dialogs.business.gschema.xml
   org.gnucash.dialogs.checkprinting.gschema.xml
   org.gnucash.dialogs.commodities.gschema.xml
@@ -42,8 +42,8 @@ if (COMPILE_GSCHEMAS)
                               ${GLIB_COMPILE_SCHEMAS} $DESTDIR${CMAKE_INSTALL_FULL_DATADIR}/glib-2.0/schemas\")")
 endif ()
 
-SET(gschemas_DIST_local "")
+set(gschemas_DIST_local "")
-FOREACH(file ${gschema_SOURCES})
+foreach(file ${gschema_SOURCES})
-    LIST(APPEND gschemas_DIST_local ${file}.in)
+    list(APPEND gschemas_DIST_local ${file}.in)
-ENDFOREACH()
+endforeach()
-SET_DIST_LIST(gschemas_DIST CMakeLists.txt ${gschemas_DIST_local})
+set_dist_list(gschemas_DIST CMakeLists.txt ${gschemas_DIST_local})

gnucash/gtkbuilder/CMakeLists.txt

@@ -68,4 +68,4 @@ file (COPY ${gtkbuilder_SOURCES} DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder
 
 install (FILES ${gtkbuilder_SOURCES} DESTINATION share/gnucash/gtkbuilder)
 
-SET_DIST_LIST(gtkbuilder_DIST CMakeLists.txt ${gtkbuilder_SOURCES})
+set_dist_list(gtkbuilder_DIST CMakeLists.txt ${gtkbuilder_SOURCES})

gnucash/html/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET (html_HEADERS
+set (html_HEADERS
   gnc-html-history.h
   gnc-html.h
   gnc-html-p.h
@@ -15,50 +15,50 @@ gnc_add_swig_guile_command (swig-gnc-html-c
     ${CMAKE_CURRENT_SOURCE_DIR}/gnc-html.i "${gncmod_html_HEADERS}"
 )
 
-SET (html_SOURCES
+set (html_SOURCES
   gncmod-html.c
   gnc-html.c
   gnc-html-history.c
   gnc-html-factory.c
 )
 
-IF (WEBKIT1)
+if (WEBKIT1)
-  LIST(APPEND html_HEADERS gnc-html-webkit1.h)
+  list(APPEND html_HEADERS gnc-html-webkit1.h)
-  LIST(APPEND html_SOURCES gnc-html-webkit1.c)
+  list(APPEND html_SOURCES gnc-html-webkit1.c)
-  SET(html_EXTRA_DIST gnc-html-webkit2.h gnc-html-webkit2.c)
+  set(html_EXTRA_DIST gnc-html-webkit2.h gnc-html-webkit2.c)
-ELSE ()
+else ()
-  LIST(APPEND html_HEADERS gnc-html-webkit2.h)
+  list(APPEND html_HEADERS gnc-html-webkit2.h)
-  LIST(APPEND html_SOURCES gnc-html-webkit2.c)
+  list(APPEND html_SOURCES gnc-html-webkit2.c)
-  SET(html_EXTRA_DIST gnc-html-webkit1.h gnc-html-webkit1.c)
+  set(html_EXTRA_DIST gnc-html-webkit1.h gnc-html-webkit1.c)
-ENDIF ()
+endif ()
 
-SET_DIST_LIST(html_DIST CMakeLists.txt ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST})
+set_dist_list(html_DIST CMakeLists.txt ${html_HEADERS} ${html_SOURCES} gnc-html.i ${html_EXTRA_DIST})
 
-ADD_LIBRARY (gncmod-html
+add_library (gncmod-html
   ${html_SOURCES}
   ${SWIG_GNC_HTML_C}
   ${html_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-html gncmod-engine gnc-module gncmod-gnome-utils ${WEBKIT_LDFLAGS} ${GUILE_LDFLAGS})
+target_link_libraries(gncmod-html gncmod-engine gnc-module gncmod-gnome-utils ${WEBKIT_LDFLAGS} ${GUILE_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS(gncmod-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
+target_compile_definitions(gncmod-html PRIVATE -DG_LOG_DOMAIN=\"gnc.html\")
 
 
-TARGET_INCLUDE_DIRECTORIES (gncmod-html
+target_include_directories (gncmod-html
 PUBLIC
     ${GTK3_INCLUDE_DIRS}
     ${WEBKIT_INCLUDE_DIRS}
     ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-html PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-html
+install(TARGETS gncmod-html
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-INSTALL(FILES ${html_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+install(FILES ${html_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)

gnucash/import-export/CMakeLists.txt

@@ -1,20 +1,20 @@
 # CMakeLists.txt for gnucash/import-export
 
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
 # ############################################################
-ADD_SUBDIRECTORY(aqb)
+add_subdirectory(aqb)
-ADD_SUBDIRECTORY(bi-import)
+add_subdirectory(bi-import)
-ADD_SUBDIRECTORY(csv-exp)
+add_subdirectory(csv-exp)
-ADD_SUBDIRECTORY(csv-imp)
+add_subdirectory(csv-imp)
-ADD_SUBDIRECTORY(customer-import)
+add_subdirectory(customer-import)
-ADD_SUBDIRECTORY(log-replay)
+add_subdirectory(log-replay)
-ADD_SUBDIRECTORY(ofx)
+add_subdirectory(ofx)
-ADD_SUBDIRECTORY(qif)
+add_subdirectory(qif)
-ADD_SUBDIRECTORY(qif-imp)
+add_subdirectory(qif-imp)
 
 
-SET (generic_import_SOURCES
+set (generic_import_SOURCES
   import-account-matcher.c
   import-commodity-matcher.c
   import-backend.c
@@ -29,13 +29,13 @@ SET (generic_import_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${generic_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${generic_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET (generic_import_HEADERS
+set (generic_import_HEADERS
   import-parse.h
 )
 
-SET (generic_import_noinst_HEADERS
+set (generic_import_noinst_HEADERS
   import-account-matcher.h
   import-backend.h
   import-commodity-matcher.h
@@ -46,38 +46,38 @@ SET (generic_import_noinst_HEADERS
   import-utilities.h
 )
 
-ADD_LIBRARY (gncmod-generic-import
+add_library (gncmod-generic-import
   ${generic_import_SOURCES}
   ${generic_import_HEADERS}
   ${generic_import_noinst_HEADERS}
 )
 
-TARGET_LINK_LIBRARIES(gncmod-generic-import gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
+target_link_libraries(gncmod-generic-import gncmod-gnome-utils gncmod-engine ${GTK3_LDFLAGS} ${GLIB2_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
+target_compile_definitions (gncmod-generic-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import\")
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+target_include_directories(gncmod-generic-import PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-generic-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-generic-import
+install(TARGETS gncmod-generic-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
 )
 
-INSTALL(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
+install(FILES ${generic_import_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/gnucash)
 
-SET(generic_import_EXTRA_DIST generic-import-design.txt)
+set(generic_import_EXTRA_DIST generic-import-design.txt)
 
-SET_LOCAL_DIST(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES}
+set_local_dist(import_export_DIST_local CMakeLists.txt ${generic_import_SOURCES}
         ${generic_import_HEADERS} ${generic_import_noinst_HEADERS}
         ${generic_import_EXTRA_DIST})
 
-SET(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
+set(import_export_DIST ${import_export_DIST_local} ${aqbanking_DIST} ${bi_import_DIST}
         ${csv_export_DIST} ${csv_import_DIST} ${customer_import_DIST}
         ${log_report_DIST} ${ofx_DIST} ${qif_DIST} ${qif_import_DIST}
         ${test_generic_import_DIST}

gnucash/import-export/aqb/CMakeLists.txt

@@ -1,9 +1,9 @@
 # CMakeLists.txt for gnucash/import-export/aqbanking
 
-ADD_SUBDIRECTORY(gschemas)
+add_subdirectory(gschemas)
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
-SET (aqbanking_SOURCES
+set (aqbanking_SOURCES
   dialog-ab-trans.c
   dialog-ab-daterange.c
   assistant-ab-initial.c
@@ -19,9 +19,9 @@ SET (aqbanking_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${aqbanking_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${aqbanking_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET (aqbanking_noinst_HEADERS
+set (aqbanking_noinst_HEADERS
   dialog-ab-trans.h
   dialog-ab-daterange.h
   assistant-ab-initial.h
@@ -35,45 +35,45 @@ SET (aqbanking_noinst_HEADERS
   gnc-plugin-aqbanking.h
 )
 
-SET(aqbanking_GLADE assistant-ab-initial.glade dialog-ab.glade dialog-ab-pref.glade)
+set(aqbanking_GLADE assistant-ab-initial.glade dialog-ab.glade dialog-ab-pref.glade)
 
-SET(aqbanking_UI gnc-plugin-aqbanking-ui.xml)
+set(aqbanking_UI gnc-plugin-aqbanking-ui.xml)
 
-IF(WITH_AQBANKING)
+if(WITH_AQBANKING)
-  ADD_LIBRARY (gncmod-aqbanking
+  add_library (gncmod-aqbanking
     ${aqbanking_SOURCES}
     ${aqbanking_noinst_HEADERS}
   )
 
-  SET(AQB_EXPORT_SYMBOLS "")
+  set(AQB_EXPORT_SYMBOLS "")
-  IF (WIN32)
+  if (WIN32)
-    SET(AQB_EXPORT_SYMBOLS "-Wl,--export-all-symbols")
+    set(AQB_EXPORT_SYMBOLS "-Wl,--export-all-symbols")
-  ENDIF()
+  endif()
-  SET(AQB_LIBSTDCXX "")
+  set(AQB_LIBSTDCXX "")
-  IF (MINGW)
+  if (MINGW)
-    SET(AQB_LIBSTDCXX "-lstdc++")
+    set(AQB_LIBSTDCXX "-lstdc++")
-  ENDIF()
+  endif()
 
-  TARGET_LINK_LIBRARIES(gncmod-aqbanking gnc-gnome gncmod-gnome-utils
+  target_link_libraries(gncmod-aqbanking gnc-gnome gncmod-gnome-utils
          gncmod-generic-import gncmod-register-core
          gncmod-register-gnome gncmod-ledger-core gncmod-engine gwengui-gtk3
          ${AQB_EXPORT_SYMBOLS} ${AQBANKING_LDFLAGS}
          ${GWENHYWFAR_LDFLAGS} 
          ${GNOME_LDFLAGS} ${KTOBLZCHECK_LDFLAGS} ${AQB_LIBSTDCXX})
 
-  TARGET_COMPILE_DEFINITIONS(gncmod-aqbanking PRIVATE -DG_LOG_DOMAIN=\"gnc.import.aqbanking\")
+  target_compile_definitions(gncmod-aqbanking PRIVATE -DG_LOG_DOMAIN=\"gnc.import.aqbanking\")
 
-  TARGET_INCLUDE_DIRECTORIES(gncmod-aqbanking PRIVATE
+  target_include_directories(gncmod-aqbanking PRIVATE
     ${CMAKE_SOURCE_DIR}/borrowed/gwengui-gtk3
     ${AQBANKING_INCLUDE_DIRS}
     ${GWENHYWFAR_INCLUDE_DIRS}
     ${KTOBLZCHECK_INCLUDE_DIRS})
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-aqbanking PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-aqbanking PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-  INSTALL(TARGETS gncmod-aqbanking
+  install(TARGETS gncmod-aqbanking
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
     ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
     RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -81,18 +81,18 @@ ENDIF()
 # No headers to install
 
 
-  INSTALL(FILES ${aqbanking_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
+  install(FILES ${aqbanking_GLADE} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/gtkbuilder)
 
-  INSTALL(FILES ${aqbanking_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
+  install(FILES ${aqbanking_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
 
-  FILE(COPY ${aqbanking_UI}
+  file(COPY ${aqbanking_UI}
     DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-  FILE(COPY ${aqbanking_GLADE}
+  file(COPY ${aqbanking_GLADE}
     DESTINATION ${DATADIR_BUILD}/gnucash/gtkbuilder)
-ENDIF(WITH_AQBANKING)
+endif(WITH_AQBANKING)
 
-SET_LOCAL_DIST(aqbanking_DIST_local CMakeLists.txt migratable-prefs-aqbanking.xml
+set_local_dist(aqbanking_DIST_local CMakeLists.txt migratable-prefs-aqbanking.xml
         ${aqbanking_SOURCES} ${aqbanking_noinst_HEADERS} ${aqbanking_EXTRA_DIST}
         ${aqbanking_GLADE} ${aqbanking_UI})
 
-SET(aqbanking_DIST ${aqbanking_DIST_local} ${aqbanking_gschema_DIST} ${test_aqb_DIST} PARENT_SCOPE)
+set(aqbanking_DIST ${aqbanking_DIST_local} ${aqbanking_gschema_DIST} ${test_aqb_DIST} PARENT_SCOPE)

gnucash/import-export/aqb/gschemas/CMakeLists.txt

@@ -1,8 +1,8 @@
 
-IF (WITH_AQBANKING)
+if (WITH_AQBANKING)
-  SET(aqb_GSCHEMA org.gnucash.dialogs.import.hbci.gschema.xml)
+  set(aqb_GSCHEMA org.gnucash.dialogs.import.hbci.gschema.xml)
 
   add_gschema_targets("${aqb_GSCHEMA}")
-ENDIF(WITH_AQBANKING)
+endif(WITH_AQBANKING)
 
-SET_DIST_LIST(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in)
+set_dist_list(aqbanking_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.hbci.gschema.xml.in)

gnucash/import-export/aqb/test/CMakeLists.txt

@@ -26,11 +26,11 @@ set(test_aqb_LIBS
   ${GLIB2_LDFLAGS}
 )
 
-SET_DIST_LIST(test_aqb_DIST ${test_aqb_SOURCES} file-book.gnucash
+set_dist_list(test_aqb_DIST ${test_aqb_SOURCES} file-book.gnucash
   file-book-hbcislot.gnucash CMakeLists.txt )
-IF(WITH_AQBANKING)
+if(WITH_AQBANKING)
-  GNC_ADD_TEST(test-aqb
+  gnc_add_test(test-aqb
     "${test_aqb_SOURCES}"
     test_aqb_INCLUDE_DIRS
     test_aqb_LIBS SRCDIR=${CMAKE_CURRENT_SOURCE_DIR})
- ENDIF()
+ endif()

gnucash/import-export/bi-import/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(bi_import_SOURCES
+set(bi_import_SOURCES
   gnc-plugin-bi-import.c
   gncmod-bi-import.c
   dialog-bi-import-gui.c
@@ -7,18 +7,18 @@ SET(bi_import_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${bi_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${bi_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET(bi_import_noinst_HEADERS
+set(bi_import_noinst_HEADERS
   gnc-plugin-bi-import.h 
   dialog-bi-import-gui.h 
   dialog-bi-import-helper.h 
   dialog-bi-import.h
 )
 
-ADD_LIBRARY(gncmod-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
+add_library(gncmod-bi-import ${bi_import_noinst_HEADERS} ${bi_import_SOURCES})
 
-TARGET_LINK_LIBRARIES(gncmod-bi-import
+target_link_libraries(gncmod-bi-import
   gncmod-gnome-utils
   gncmod-gnome-search
   gncmod-app-utils
@@ -28,21 +28,21 @@ TARGET_LINK_LIBRARIES(gncmod-bi-import
   gnc-gnome
 )
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-bi-import
+target_include_directories(gncmod-bi-import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
-TARGET_COMPILE_DEFINITIONS(gncmod-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
+target_compile_definitions(gncmod-bi-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.bi-import\")
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-bi-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-bi-import
+install(TARGETS gncmod-bi-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_DIST_LIST(bi_import_DIST CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})
+set_dist_list(bi_import_DIST CMakeLists.txt README ${bi_import_SOURCES} ${bi_import_noinst_HEADERS})

gnucash/import-export/csv-exp/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(csv_export_SOURCES
+set(csv_export_SOURCES
   gncmod-csv-export.c
   gnc-plugin-csv-export.c
   assistant-csv-export.c
@@ -7,31 +7,31 @@ SET(csv_export_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${csv_export_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${csv_export_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET(csv_export_noinst_HEADERS
+set(csv_export_noinst_HEADERS
   gnc-plugin-csv-export.h
   assistant-csv-export.h
   csv-tree-export.h
   csv-transactions-export.h
 )
 
-ADD_LIBRARY(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
+add_library(gncmod-csv-export ${csv_export_noinst_HEADERS} ${csv_export_SOURCES})
 
-TARGET_LINK_LIBRARIES(gncmod-csv-export gncmod-register-gnome gncmod-register-core gncmod-ledger-core gncmod-engine
+target_link_libraries(gncmod-csv-export gncmod-register-gnome gncmod-register-core gncmod-ledger-core gncmod-engine
                          gnc-module gncmod-gnome-utils gnc-gnome gncmod-app-utils gnc-core-utils)
 
-TARGET_COMPILE_DEFINITIONS(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
+target_compile_definitions(gncmod-csv-export PRIVATE -DG_LOG_DOMAIN=\"gnc.export.csv\")
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-csv-export PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-csv-export
+install(TARGETS gncmod-csv-export
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_DIST_LIST (csv_export_DIST CMakeLists.txt
+set_dist_list (csv_export_DIST CMakeLists.txt
         ${csv_export_SOURCES} ${csv_export_noinst_HEADERS})

gnucash/import-export/csv-imp/CMakeLists.txt

@@ -1,12 +1,12 @@
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
-SET(csv_import_remote_SOURCES
+set(csv_import_remote_SOURCES
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-charmap-sel.c
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-optionmenu.c
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-glib-extras.c
 )
 
-SET(csv_import_SOURCES
+set(csv_import_SOURCES
   gncmod-csv-import.c
   assistant-csv-account-import.c
   assistant-csv-price-import.cpp
@@ -29,15 +29,15 @@ SET(csv_import_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${csv_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${csv_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET(csv_import_remote_HEADERS
+set(csv_import_remote_HEADERS
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-charmap-sel.h
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-optionmenu.h
   ${CMAKE_SOURCE_DIR}/borrowed/goffice/go-glib-extras.h
 )
 
-SET(csv_import_noinst_HEADERS
+set(csv_import_noinst_HEADERS
   assistant-csv-account-import.h
   assistant-csv-price-import.h
   assistant-csv-trans-import.h
@@ -58,11 +58,11 @@ SET(csv_import_noinst_HEADERS
   gnc-tokenizer-fw.hpp
 )
 
-ADD_LIBRARY(gncmod-csv-import ${csv_import_noinst_HEADERS}
+add_library(gncmod-csv-import ${csv_import_noinst_HEADERS}
   ${csv_import_remote_HEADERS} ${csv_import_remote_SOURCES} ${csv_import_SOURCES}
 )
 
-TARGET_LINK_LIBRARIES(
+target_link_libraries(
   gncmod-csv-import
   ${Boost_LIBRARIES}
   ${ICU4C_I18N_LDFLAGS}
@@ -74,24 +74,24 @@ TARGET_LINK_LIBRARIES(
   gnc-module)
 
 
-TARGET_COMPILE_DEFINITIONS(gncmod-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
+target_compile_definitions(gncmod-csv-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.csv\")
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-csv-import PRIVATE
+target_include_directories(gncmod-csv-import PRIVATE
      ${ICU4C_I18N_INCLUDE_DIRS}
      ${CMAKE_SOURCE_DIR}/borrowed/goffice
 )
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-csv-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-csv-import
+install(TARGETS gncmod-csv-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
 # No headers to install
 
-SET_LOCAL_DIST(csv_import_DIST_local CMakeLists.txt 
+set_local_dist(csv_import_DIST_local CMakeLists.txt
         ${csv_import_SOURCES} ${csv_import_noinst_HEADERS})
-SET(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} PARENT_SCOPE)
+set(csv_import_DIST ${csv_import_DIST_local} ${test_csv_import_DIST} PARENT_SCOPE)

gnucash/import-export/csv-imp/test/CMakeLists.txt

@@ -1,5 +1,5 @@
 
-SET(CSV_IMP_TEST_INCLUDE_DIRS
+set(CSV_IMP_TEST_INCLUDE_DIRS
   ${CMAKE_BINARY_DIR}/common # for config.h
   ${CMAKE_SOURCE_DIR}/common
   ${CMAKE_SOURCE_DIR}/libgnucash/engine
@@ -7,31 +7,31 @@ SET(CSV_IMP_TEST_INCLUDE_DIRS
   ${CMAKE_SOURCE_DIR}/lib
   ${GLIB2_INCLUDE_DIRS}
 )
-SET(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine test-core)
+set(CSV_IMP_TEST_LIBS gncmod-csv-import gncmod-engine test-core)
 
 # This test does not run in Win32
-IF (NOT WIN32)
+if (NOT WIN32)
-  SET(MODULEPATH ${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp)
+  set(MODULEPATH ${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp)
-  SET(gtest_csv_imp_LIBS gncmod-csv-import ${GLIB2_LDFLAGS} ${GTEST_LIB})
+  set(gtest_csv_imp_LIBS gncmod-csv-import ${GLIB2_LDFLAGS} ${GTEST_LIB})
-  SET(gtest_csv_imp_INCLUDES
+  set(gtest_csv_imp_INCLUDES
     ${MODULEPATH}
     ${CSV_IMP_TEST_INCLUDE_DIRS}
     ${GTEST_INCLUDE_DIR})
 
-  SET(test_tokenizer_SOURCES
+  set(test_tokenizer_SOURCES
     test-tokenizer.cpp
     ${GTEST_SRC})
-  GNC_ADD_TEST(test-tokenizer "${test_tokenizer_SOURCES}"
+  gnc_add_test(test-tokenizer "${test_tokenizer_SOURCES}"
     gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS
     SRCDIR=${CMAKE_SOURCE_DIR}/gnucash/import-export/csv-imp/test)
 
-  SET(test_tx_import_SOURCES
+  set(test_tx_import_SOURCES
     test-tx-import.cpp
     ${GTEST_SRC})
-  GNC_ADD_TEST(test-tx_import "${test_tx_import_SOURCES}"
+  gnc_add_test(test-tx_import "${test_tx_import_SOURCES}"
     gtest_csv_imp_INCLUDES gtest_csv_imp_LIBS)
-ENDIF()
+endif()
 
-SET_DIST_LIST(test_csv_import_DIST CMakeLists.txt 
+set_dist_list(test_csv_import_DIST CMakeLists.txt
     test-tx-import.cpp test-tokenizer.cpp
     sample1.csv ${test_csv_imp_SOURCES})

gnucash/import-export/customer-import/CMakeLists.txt

@@ -1,4 +1,4 @@
-SET(customer_import_SOURCES
+set(customer_import_SOURCES
   gnc-plugin-customer-import.c
   gncmod-customer-import.c
   dialog-customer-import-gui.c
@@ -6,35 +6,35 @@ SET(customer_import_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${customer_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${customer_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
 
-SET(customer_import_noinst_HEADERS
+set(customer_import_noinst_HEADERS
   gnc-plugin-customer-import.h
   dialog-customer-import-gui.h
   dialog-customer-import.h
 )
 
-ADD_LIBRARY(gncmod-customer-import ${customer_import_SOURCES} ${customer_input_noinst_HEADERS})
+add_library(gncmod-customer-import ${customer_import_SOURCES} ${customer_input_noinst_HEADERS})
 
-TARGET_LINK_LIBRARIES(gncmod-customer-import gnc-gnome gncmod-gnome-utils gncmod-app-utils
+target_link_libraries(gncmod-customer-import gnc-gnome gncmod-gnome-utils gncmod-app-utils
      gncmod-engine gnc-core-utils gnc-module ${GLIB2_LDFLAGS})
 
-TARGET_INCLUDE_DIRECTORIES(gncmod-customer-import
+target_include_directories(gncmod-customer-import
   PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}
   PRIVATE ${CMAKE_SOURCE_DIR}/gnucash/gnome
 )
 
-TARGET_COMPILE_DEFINITIONS(gncmod-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\")
+target_compile_definitions(gncmod-customer-import PRIVATE -DG_LOG_DOMAIN=\"gnc.plugin.customer-import\")
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-customer-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-customer-import
+install(TARGETS gncmod-customer-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_DIST_LIST (customer_import_DIST CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})
+set_dist_list (customer_import_DIST CMakeLists.txt ${customer_import_SOURCES} ${customer_import_noinst_HEADERS})

gnucash/import-export/log-replay/CMakeLists.txt

@@ -1,34 +1,34 @@
 
-SET(log_replay_SOURCES
+set(log_replay_SOURCES
   gnc-log-replay.c
   gnc-plugin-log-replay.c
   gncmod-log-replay.c
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${log_replay_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${log_replay_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET(log_replay_noinst_HEADERS
+set(log_replay_noinst_HEADERS
   gnc-log-replay.h
   gnc-plugin-log-replay.h
 )
 
-ADD_LIBRARY(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
+add_library(gncmod-log-replay ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})
 
-TARGET_LINK_LIBRARIES(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncmod-engine
+target_link_libraries(gncmod-log-replay gncmod-gnome-utils gncmod-app-utils gncmod-engine
      gnc-core-utils gnc-module ${GTK3_LDFLAGS})
 
-TARGET_COMPILE_DEFINITIONS(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
+target_compile_definitions(gncmod-log-replay PRIVATE -DG_LOG_DOMAIN=\"gnc.import.log-replay\")
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-log-replay PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-log-replay
+install(TARGETS gncmod-log-replay
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 # No headers to install.
 
-SET_DIST_LIST(log_report_DIST CMakeLists.txt 
+set_dist_list(log_report_DIST CMakeLists.txt
         ${log_replay_SOURCES} ${log_replay_noinst_HEADERS})

gnucash/import-export/ofx/CMakeLists.txt

@@ -1,7 +1,7 @@
-ADD_SUBDIRECTORY(gschemas)
+add_subdirectory(gschemas)
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
-SET(ofx_SOURCES
+set(ofx_SOURCES
   gnc-ofx-import.c
   gnc-ofx-kvp.c
   gncmod-ofx-import.c
@@ -9,40 +9,40 @@ SET(ofx_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${ofx_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${ofx_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET(ofx_noinst_HEADERS
+set(ofx_noinst_HEADERS
   gnc-ofx-import.h
   gnc-ofx-kvp.h
   gnc-plugin-ofx.h
 )
 
-SET(ofx_UI gnc-plugin-ofx-ui.xml)
+set(ofx_UI gnc-plugin-ofx-ui.xml)
 
-IF (WITH_OFX)
+if (WITH_OFX)
-  ADD_LIBRARY(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
+  add_library(gncmod-ofx ${ofx_SOURCES} ${ofx_noinst_HEADERS})
 
-  TARGET_LINK_LIBRARIES(gncmod-ofx gncmod-generic-import gncmod-engine gncmod-app-utils gnc-core-utils
+  target_link_libraries(gncmod-ofx gncmod-generic-import gncmod-engine gncmod-app-utils gnc-core-utils
                     gncmod-gnome-utils ${LIBOFX_LDFLAGS})
 
-  TARGET_COMPILE_DEFINITIONS(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
+  target_compile_definitions(gncmod-ofx PRIVATE -DG_LOG_DOMAIN=\"gnc.import.ofx\")
 
-  TARGET_INCLUDE_DIRECTORIES(gncmod-ofx PRIVATE ${LIBOFX_INCLUDE_DIRS})
+  target_include_directories(gncmod-ofx PRIVATE ${LIBOFX_INCLUDE_DIRS})
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-ofx PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-ofx PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-  INSTALL(TARGETS gncmod-ofx
+  install(TARGETS gncmod-ofx
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 
-  INSTALL(FILES ${ofx_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
+  install(FILES ${ofx_UI} DESTINATION  ${CMAKE_INSTALL_DATADIR}/gnucash/ui)
 
-  FILE(COPY ${ofx_UI}
+  file(COPY ${ofx_UI}
     DESTINATION ${DATADIR_BUILD}/gnucash/ui)
-ENDIF()
+endif()
 
-SET_LOCAL_DIST(ofx_DIST_local CMakeLists.txt migratable-prefs-ofx.xml ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI})
+set_local_dist(ofx_DIST_local CMakeLists.txt migratable-prefs-ofx.xml ${ofx_SOURCES} ${ofx_noinst_HEADERS} ${ofx_UI})
-SET(ofx_DIST ${ofx_DIST_local} ${test_ofx_DIST} ${ofx_gschema_DIST} PARENT_SCOPE)
+set(ofx_DIST ${ofx_DIST_local} ${test_ofx_DIST} ${ofx_gschema_DIST} PARENT_SCOPE)

gnucash/import-export/ofx/gnc-ofx-import.c

@@ -337,8 +337,25 @@ fix_ofx_bug_39 (time64 t)
 {
 #if HAVE_OFX_BUG_39
     struct tm stm;
+
+#ifdef __FreeBSD__
+    time64 now;
+    /*
+     * FreeBSD has it's own libc implementation which differs from glibc. In particular:
+     * There is no daylight global
+     * tzname members are set to the string "   " (three spaces) when not explicitly populated
+     *
+     * To check that the current timezone does not observe DST I check if tzname[1] starts with a space.
+     */
+    now = gnc_time (NULL);
+    gnc_localtime_r(&now, &stm);
+    tzset();
+
+    if (tzname[1][0] != ' ' && !stm.tm_isdst)
+#else
     gnc_localtime_r(&t, &stm);
     if (daylight && !stm.tm_isdst)
+#endif
         t += 3600;
 #endif
     return t;

gnucash/import-export/ofx/gschemas/CMakeLists.txt

@@ -1,8 +1,8 @@
 
-IF (WITH_OFX)
+if (WITH_OFX)
   set(ofx_GSCHEMA org.gnucash.dialogs.import.ofx.gschema.xml)
 
   add_gschema_targets("${ofx_GSCHEMA}")
-ENDIF (WITH_OFX)
+endif (WITH_OFX)
 
-SET_DIST_LIST(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in)
+set_dist_list(ofx_gschema_DIST CMakeLists.txt org.gnucash.dialogs.import.ofx.gschema.xml.in)

gnucash/import-export/ofx/test/CMakeLists.txt

@@ -1,10 +1,10 @@
 
 
-IF(WITH_OFX)
+if(WITH_OFX)
-  SET(OFX_TEST_INCLUDE_DIRS ${LIBOFX_INCLUDE_DIRS})
+  set(OFX_TEST_INCLUDE_DIRS ${LIBOFX_INCLUDE_DIRS})
-  SET(OFX_TEST_LIBS)
+  set(OFX_TEST_LIBS)
 
-  GNC_ADD_TEST(test-link-ofx test-link.c OFX_TEST_INCLUDE_DIRS OFX_TEST_LIBS)
+  gnc_add_test(test-link-ofx test-link.c OFX_TEST_INCLUDE_DIRS OFX_TEST_LIBS)
-ENDIF(WITH_OFX)
+endif(WITH_OFX)
 
-SET_DIST_LIST(test_ofx_DIST CMakeLists.txt test-link.c)
+set_dist_list(test_ofx_DIST CMakeLists.txt test-link.c)

gnucash/import-export/qif-imp/CMakeLists.txt

@@ -1,8 +1,8 @@
 # CMakeLists.txt for gnucash/import_export/qif-imp
 
-ADD_SUBDIRECTORY(test)
+add_subdirectory(test)
 
-SET (qif_import_SOURCES
+set (qif_import_SOURCES
     dialog-account-picker.c
     assistant-qif-import.c
     gnc-plugin-qif-import.c
@@ -10,25 +10,25 @@ SET (qif_import_SOURCES
 )
 
 # Add dependency on config.h
-SET_SOURCE_FILES_PROPERTIES (${qif_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+set_source_files_properties (${qif_import_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
 
-SET (qif_import_noinst_HEADERS
+set (qif_import_noinst_HEADERS
     dialog-account-picker.h
     assistant-qif-import.h
     gnc-plugin-qif-import.h
 )
 
-ADD_LIBRARY	(gncmod-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS})
+add_library	(gncmod-qif-import ${qif_import_SOURCES} ${qif_import_noinst_HEADERS})
 
-TARGET_LINK_LIBRARIES(gncmod-qif-import gncmod-app-utils gncmod-gnome-utils gnc-gnome)
+target_link_libraries(gncmod-qif-import gncmod-app-utils gncmod-gnome-utils gnc-gnome)
 
-TARGET_COMPILE_DEFINITIONS(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
+target_compile_definitions(gncmod-qif-import PRIVATE -DG_LOG_DOMAIN=\"gnc.import.qif.import\")
 
-IF (APPLE)
+if (APPLE)
-  SET_TARGET_PROPERTIES (gncmod-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
+  set_target_properties (gncmod-qif-import PROPERTIES INSTALL_NAME_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/gnucash")
-ENDIF()
+endif()
 
-INSTALL(TARGETS gncmod-qif-import
+install(TARGETS gncmod-qif-import
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/gnucash
   RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
@@ -37,11 +37,11 @@ INSTALL(TARGETS gncmod-qif-import
 
 # Scheme
 
-SET (qif_import_SCHEME_0
+set (qif_import_SCHEME_0
   string.scm
   )
 
-SET (qif_import_SCHEME
+set (qif_import_SCHEME
   qif-dialog-utils.scm
   qif-file.scm
   qif-guess-map.scm
@@ -53,11 +53,11 @@ SET (qif_import_SCHEME
   qif-import.scm # yes, included in both SETs
 )
 
-SET(qif_import_SCHEME_2
+set(qif_import_SCHEME_2
   qif-import.scm
 )
 
-SET(GUILE_DEPENDS
+set(GUILE_DEPENDS
   gncmod-qif-import
   gnc-gnome
   scm-core-utils
@@ -68,27 +68,27 @@ SET(GUILE_DEPENDS
   scm-gnome-utils
   )
 
-GNC_ADD_SCHEME_TARGETS(scm-qif-import-0
+gnc_add_scheme_targets(scm-qif-import-0
   "${qif_import_SCHEME_0}"
   "gnucash/import-export"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
-GNC_ADD_SCHEME_TARGETS(scm-qif-import-2
+gnc_add_scheme_targets(scm-qif-import-2
   "${qif_import_SCHEME_2}"
   "gnucash/import-export"
   "${GUILE_DEPENDS}"
   FALSE
 )
 
-GNC_ADD_SCHEME_TARGETS(scm-qif-import
+gnc_add_scheme_targets(scm-qif-import
   "${qif_import_SCHEME}"
   "qif-import"
   "${GUILE_DEPENDS};scm-qif-import-0"
   FALSE
 )
 
-SET_LOCAL_DIST(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
+set_local_dist(qif_import_DIST_local CMakeLists.txt file-format.txt ${qif_import_SOURCES} ${qif_import_noinst_HEADERS}
         ${qif_import_SCHEME_0} ${qif_import_SCHEME} ${qif_import_SCHEME_2})
-SET(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)
+set(qif_import_DIST ${qif_import_DIST_local} ${test_qif_import_DIST} PARENT_SCOPE)