gnucash stable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/9748e6f3 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/b183c39a (commit)
	from  https://github.com/Gnucash/gnucash/commit/a036fe59 (commit)



commit 9748e6f3fb3833ee7614cd00a9138f1859116282
Merge: a036fe5915 b183c39a95
Author: John Ralls <jralls at ceridwen.us>
Date:   Thu May 25 09:02:38 2023 -0400

    Merge Monson Shao's 'check-gdk' into stable.


commit b183c39a95693e96f3f33b9fe696b9069da05bf0
Author: Monson Shao <holymonson at gmail.com>
Date:   Mon May 1 22:37:04 2023 +0800

    cmake: check gdk only when building GUI

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a819a61b5a..287953955d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -792,11 +792,13 @@ set_property(TARGET PkgConfig::GLIB2 PROPERTY INTERFACE_COMPILE_DEFINITIONS
   GLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_${GLIB_API}
   GLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_${GLIB_API})
 
+if (WITH_GNUCASH)
 string(REGEX MATCH "^([0-9]+)\.([0-9]+)" GTK_MIN_MATCH ${GTK_MIN_VERSION})
 set(GTK_API ${CMAKE_MATCH_1}_${CMAKE_MATCH_2})
 set_property(TARGET PkgConfig::GTK3 PROPERTY INTERFACE_COMPILE_DEFINITIONS
   GDK_VERSION_MIN_REQUIRED=GDK_VERSION_${GTK_API}
   GDK_VERSION_MAX_ALLOWED=GDK_VERSION_${GTK_API})
+endif()
 
 add_definitions (-DHAVE_CONFIG_H)
 



Summary of changes:
 CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)