Merge maint

This commit is contained in:
Geert Janssens
2019-08-17 12:53:55 +02:00
29 changed files with 26373 additions and 25745 deletions

View File

@@ -45,6 +45,7 @@ include (GncAddTest)
include (MakeDistFiles)
include (GNUInstallDirs)
include (TestBigEndian)
include (CheckSymbolExists)
# ############################################################
# These options are settable from the CMake command line. For example, to disable
@@ -362,6 +363,13 @@ find_guile_dirs()
if (WITH_AQBANKING)
pkg_check_modules (GWENHYWFAR REQUIRED gwenhywfar>=4.9.99)
pkg_check_modules (AQBANKING REQUIRED aqbanking>=5.3.4)
set(CMAKE_REQUIRED_INCLUDES "${AQBANKING_INCLUDE_DIRS}"
"${GWENHYWFAR_INCLUDE_DIRS}")
set(CMAKE_REQUIRED_LIBRARIES "-laqbanking")
check_symbol_exists("AB_Banking_RuntimeConfig_SetCharValue"
"aqbanking/banking.h" AQB_HAS_RUNTIME_CONFIG)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
if(WITH_GNUCASH)
pkg_check_modules (GWEN_GTK3 gwengui-gtk3)
if(GWEN_GTK3_FOUND AND GWEN_GTK3_VERSION VERSION_GREATER "4.20.0")