gnucash unstable: Fix test for GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/b4877301 (commit)
	from  https://github.com/Gnucash/gnucash/commit/1fc46fe1 (commit)



commit b4877301c8199533e8e91089c3587be004860670
Author: John Ralls <jralls at ceridwen.us>
Date:   Tue Jan 23 18:29:19 2018 -0800

    Fix test for GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
    
    It's an enum value, so cmake_check_symbol_exists doesn't work.

diff --git a/gnucash/CMakeLists.txt b/gnucash/CMakeLists.txt
index 3ed122b..1c26f42 100644
--- a/gnucash/CMakeLists.txt
+++ b/gnucash/CMakeLists.txt
@@ -4,6 +4,19 @@
 set(SCHEMADIR_BUILD ${DATADIR_BUILD}/glib-2.0/schemas)
 file(MAKE_DIRECTORY ${SCHEMADIR_BUILD})
 unset(gschema_depends CACHE)
+# Check for GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK; it's Gtk3-14 and later.
+include(CheckCSourceCompiles)
+unset(have_mod_mask CACHE)
+set(CMAKE_REQUIRED_INCLUDES ${GTK3_INCLUDE_DIRS})
+check_c_source_compiles("
+#include <gdk/gdk.h>
+
+int main (int argc, char** argv) {
+  GdkModifierIntent foo = GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK;
+  return 0;
+}
+"
+ have_mod_mask)
 
 # The subdirectories
 ADD_SUBDIRECTORY (gnome)
diff --git a/gnucash/gnome-utils/CMakeLists.txt b/gnucash/gnome-utils/CMakeLists.txt
index 5c12e26..5863ba0 100644
--- a/gnucash/gnome-utils/CMakeLists.txt
+++ b/gnucash/gnome-utils/CMakeLists.txt
@@ -35,7 +35,6 @@ ADD_CUSTOM_COMMAND(
 ADD_CUSTOM_TARGET(gnc-warnings-c DEPENDS ${GNC_WARNINGS_C})
 
 #GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK
-check_symbol_exists(GDK_MODIFIER_INTENT_DEFAULT_MOD_MASK gdk/gdktypes.h have_mod_mask)
 if (NOT have_mod_mask)
 if (MAC_INTEGRATION)
   add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_MOD2_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK)



Summary of changes:
 gnucash/CMakeLists.txt             | 13 +++++++++++++
 gnucash/gnome-utils/CMakeLists.txt |  1 -
 2 files changed, 13 insertions(+), 1 deletion(-)