gnucash master: Don't try to build gnucash-windows-locale.c on non-Windows OSes.

John Ralls jralls at code.gnucash.org
Sat May 30 17:48:34 EDT 2020


Updated	 via  https://github.com/Gnucash/gnucash/commit/8654cb86 (commit)
	from  https://github.com/Gnucash/gnucash/commit/14ed3222 (commit)



commit 8654cb86c88245aa605e71238d177b34959e0aa9
Author: John Ralls <jralls at ceridwen.us>
Date:   Sat May 30 14:48:20 2020 -0700

    Don't try to build gnucash-windows-locale.c on non-Windows OSes.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 8f738c1dc..879a84725 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -41,9 +41,12 @@ set (gnucash_SOURCES
   gnucash-commands.cpp
   gnucash-core-app.cpp
   gnucash-gresources.c
-  gnucash-windows-locale.c
   ${GNUCASH_RESOURCE_FILE}
-)
+  )
+
+if (MINGW)
+  list(APPEND gnucash_SOURCES "gnucash-windows-locale.c")
+endif()
 
 add_executable (gnucash
     ${gnucash_SOURCES}
@@ -63,11 +66,18 @@ target_link_libraries (gnucash
    ${Boost_LIBRARIES}
 )
 
-add_executable (gnucash-cli
+set(gnucash_cli_SOURCES
     gnucash-cli.cpp
     gnucash-commands.cpp
     gnucash-core-app.cpp
-    gnucash-windows-locale.c
+    )
+
+if (MINGW)
+  list(APPEND gnucash_cli_SOURCES "gnucash-windows-locale.c")
+endif()
+
+add_executable (gnucash-cli
+    ${gnucash_cli_SOURCES}
     ${GNUCASH_RESOURCE_FILE}
     ${gnucash_noinst_HEADERS}
 )



Summary of changes:
 gnucash/CMakeLists.txt | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)



More information about the gnucash-changes mailing list