gnucash maint: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/70eb7172 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/82b3af96 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/84dede1a (commit)
	from  https://github.com/Gnucash/gnucash/commit/23d0fa13 (commit)



commit 70eb7172d5801d0377a0e80789db589be2505da5
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 12 22:49:44 2019 +0200

    Drop special case for old cmake versions
    
    We require 3.5 which is more recent than 3.3

diff --git a/common/cmake_modules/MakeDistFiles.cmake b/common/cmake_modules/MakeDistFiles.cmake
index dd6a0751d..277374dc1 100644
--- a/common/cmake_modules/MakeDistFiles.cmake
+++ b/common/cmake_modules/MakeDistFiles.cmake
@@ -1,9 +1,4 @@
 
-if (${CMAKE_VERSION} VERSION_LESS 3.3)
-    include(CMakeParseArguments)
-endif()
-
-
 function(set_local_dist output)
     set(dist_files "")
     foreach(file ${ARGN})

commit 82b3af969571077d584eb550aa5edb4e35663d54
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 12 22:21:09 2019 +0200

    Change scheme file compile command invocation
    
    This
    * adds normal double quotes around the guild function call
    * removes escaped quotes from paths
    * add 'VERBATIM' keyword to let cmake perform its own escape logic on the commands
    
    Verified to work on Windows and linux with both ninja and make.

diff --git a/common/cmake_modules/GncAddSchemeTargets.cmake b/common/cmake_modules/GncAddSchemeTargets.cmake
index 740845096..977ef1bfd 100644
--- a/common/cmake_modules/GncAddSchemeTargets.cmake
+++ b/common/cmake_modules/GncAddSchemeTargets.cmake
@@ -119,7 +119,7 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
       if (MINGW64)
         set(fpath "")
         file(TO_CMAKE_PATH "$ENV{PATH}" fpath)
-        set(LIBRARY_PATH "PATH=\"${BINDIR_BUILD};${fpath}\"")
+        set(LIBRARY_PATH "PATH=${BINDIR_BUILD};${fpath}")
       else (MINGW64)
         set (LIBRARY_PATH "LD_LIBRARY_PATH=${LIBDIR_BUILD}:${LIBDIR_BUILD}/gnucash")
       endif (MINGW64)
@@ -150,13 +150,14 @@ function(gnc_add_scheme_targets _TARGET _SOURCE_FILES _OUTPUT_DIR _GUILE_DEPENDS
         COMMAND ${CMAKE_COMMAND} -E env
             "${LIBRARY_PATH}"
             "GNC_UNINSTALLED=YES"
-            "GNC_BUILDDIR=\"${CMAKE_BINARY_DIR}\""
-            "GUILE_LOAD_PATH=\"${_GUILE_LOAD_PATH}\""
-            "GUILE_LOAD_COMPILED_PATH=\"${_GUILE_LOAD_COMPILED_PATH}\""
-            "GNC_MODULE_PATH=\"${_GNC_MODULE_PATH}\""
-            ${GUILE_EXECUTABLE} -e '\(@@ \(guild\) main\)' -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
+            "GNC_BUILDDIR=${CMAKE_BINARY_DIR}"
+            "GUILE_LOAD_PATH=${_GUILE_LOAD_PATH}"
+            "GUILE_LOAD_COMPILED_PATH=${_GUILE_LOAD_COMPILED_PATH}"
+            "GNC_MODULE_PATH=${_GNC_MODULE_PATH}"
+            ${GUILE_EXECUTABLE} -e "\(@@ \(guild\) main\)" -s ${GUILD_EXECUTABLE} compile -o ${output_file} ${source_file_abs_path}
         DEPENDS ${guile_depends}
         MAIN_DEPENDENCY ${source_file_abs_path}
+        VERBATIM
         )
   endforeach(source_file)
   if (__DEBUG)

commit 84dede1ab7a59d569878a3fed6568e65d53597ee
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Sep 12 22:19:05 2019 +0200

    Remove leaked work in progress file from POTFILES.in

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 74f442854..61f879b4f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -157,7 +157,6 @@ gnucash/gnome-utils/gnc-main-window.c
 gnucash/gnome-utils/gnc-menu-extensions.c
 gnucash/gnome-utils/gnc-menu-extensions.scm
 gnucash/gnome-utils/gncmod-gnome-utils.c
-gnucash/gnome-utils/gnc-option-wrapper.cpp
 gnucash/gnome-utils/gnc-period-select.c
 gnucash/gnome-utils/gnc-plugin.c
 gnucash/gnome-utils/gnc-plugin-file-history.c



Summary of changes:
 common/cmake_modules/GncAddSchemeTargets.cmake | 13 +++++++------
 common/cmake_modules/MakeDistFiles.cmake       |  5 -----
 po/POTFILES.in                                 |  1 -
 3 files changed, 7 insertions(+), 12 deletions(-)