IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove test for GDK_MODIFIER_INTENT_MOD_SELECTION.

Browse Source 
Added in 3.14, we require 3.18.
This commit is contained in:
John Ralls 2019-09-13 10:18:14 -07:00
parent ffe7906e02
commit e4eedfe662
3 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gnucash/CMakeLists.txt
View File

@ -4,20 +4,6 @@
set(SCHEMADIR_BUILD ${DATADIR_BUILD}/glib-2.0/schemas) set(SCHEMADIR_BUILD ${DATADIR_BUILD}/glib-2.0/schemas)
file(MAKE_DIRECTORY ${SCHEMADIR_BUILD}) file(MAKE_DIRECTORY ${SCHEMADIR_BUILD})
unset(gschema_depends CACHE) 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 # The subdirectories
add_subdirectory (gnome) add_subdirectory (gnome)
add_subdirectory (gnome-utils) add_subdirectory (gnome-utils)

9
gnucash/gnome-utils/CMakeLists.txt
View File

@ -25,15 +25,6 @@ add_custom_command(
${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${WARNINGS_SCHEMA} ${LIBXSLT_XSLTPROC_EXECUTABLE} -o ${GNC_WARNINGS_H} ${CMAKE_CURRENT_SOURCE_DIR}/make-gnc-warnings-h.xsl ${WARNINGS_SCHEMA}
) )
#GTK before 3.14 didn't have GDK_MODIFIER_INTENT_DEFAULT_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)
else (MAC_INTEGRATION)
add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK)
endif (MAC_INTEGRATION)
endif (NOT have_mod_mask)
set (gnome_utils_SOURCES set (gnome_utils_SOURCES
account-quickfill.c account-quickfill.c
assistant-xml-encoding.c assistant-xml-encoding.c

10
gnucash/register/register-gnome/CMakeLists.txt
View File

@ -1,16 +1,6 @@
add_subdirectory(test) add_subdirectory(test)
include(CheckSymbolExists) include(CheckSymbolExists)
#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)
else (MAC_INTEGRATION)
add_definitions(-DGDK_MODIFIER_INTENT_DEFAULT_MOD_MASK=GDK_SHIFT_MASK|GDK_CONTROL_MASK|GDK_MOD1_MASK|GDK_SUPER_MASK|GDK_HYPER_MASK|GDK_META_MASK)
endif(MAC_INTEGRATION)
endif(NOT have_mod_mask)
set (register_gnome_SOURCES set (register_gnome_SOURCES
gncmod-register-gnome.c gncmod-register-gnome.c
combocell-gnome.c combocell-gnome.c