gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/64bcd320 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/2d9938b5 (commit)
	from  https://github.com/Gnucash/gnucash/commit/85f26b6e (commit)



commit 64bcd320bbd4c1f58f0b96de3b96fd21b6897738
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jun 11 11:55:25 2020 +0200

    Bug 797791 - [Windows] list of command line options after 'gnucash.exe --help'?
    
    This commit makes gnucash-cli a console application on Windows which
    means it's output will be redirected to the connected console.
    This works both in cmd.exe and in powershell.
    
    gnucash itself remains a Windows GUI application and hence won't output
    to console. To capture its output one needs to start it from cmd.exe
    (not powershell!) as follows
    'path-to-gnucash.exe' >'file-for-stdout' 2>'file-for-stderr'
    
    'file-for-stdout' and 'file-for-stderr' are the names file two arbitrary
    files the user has write access to. They don't have to exist beforehand.
    
    Note 'file-for-stderr' can be set to '&1' (without the single quotes)
    to redirect everything on stderr to wherever stdout goes.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 703cacfdb..9e41c3c51 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -74,6 +74,7 @@ set(gnucash_cli_SOURCES
 
 if (MINGW)
   list(APPEND gnucash_cli_SOURCES "gnucash-windows-locale.c")
+  target_link_options(gnucash-cli PRIVATE -mconsole)
 endif()
 
 add_executable (gnucash-cli

commit 2d9938b57779d134a1aba03477a0ce20cbda5158
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Thu Jun 11 11:55:17 2020 +0200

    Revert "Make gnucash-cli a console application on Windows"
    
    This reverts commit 85f26b6e3050342b4bc3e28fba2d1c673c119544.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 9e41c3c51..703cacfdb 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -74,7 +74,6 @@ set(gnucash_cli_SOURCES
 
 if (MINGW)
   list(APPEND gnucash_cli_SOURCES "gnucash-windows-locale.c")
-  target_link_options(gnucash-cli PRIVATE -mconsole)
 endif()
 
 add_executable (gnucash-cli



Summary of changes: