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

Changes to accommodate moving guile engine bindings to bindings/guile.

Browse Source 
Plus for changing targets gncmod-engine and gncmod-app-utils to
gnc-engine and gnc-app-utils.
This commit is contained in:
John Ralls
2020-01-20 11:32:10 -08:00
parent d2535fe21b
commit ffc6866406
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -569,7 +569,7 @@ endif()
add_definitions(-D_GNU_SOURCE) add_definitions(-D_GNU_SOURCE)
# Also, set the C++ version to c++11 # Set up the language standards:
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_EXTENSIONS OFF)

5
libgnucash/app-utils/gnc-optiondb.i
View File

@@ -39,7 +39,12 @@ namespace std {
%module sw_gnc_optiondb %module sw_gnc_optiondb
%{ %{
extern "C"
{
#include <config.h>
#include <libguile.h> #include <libguile.h>
#include <gnc-engine-guile.h>
}
#include "gnc-optiondb.hpp" #include "gnc-optiondb.hpp"
extern "C" SCM scm_init_sw_gnc_optiondb_module(void); extern "C" SCM scm_init_sw_gnc_optiondb_module(void);
%} %}

11
libgnucash/app-utils/test/CMakeLists.txt
View File

@@ -43,8 +43,8 @@ set(gtest_gnc_option_INCLUDES
${GUILE_INCLUDE_DIRS}) ${GUILE_INCLUDE_DIRS})
set(gtest_gnc_option_LIBS set(gtest_gnc_option_LIBS
gncmod-app-utils gnc-app-utils
gncmod-engine gnc-engine
${GLIB2_LDFLAGS} ${GLIB2_LDFLAGS}
${GUILE_LDFLAGS} ${GUILE_LDFLAGS}
gtest) gtest)
@@ -94,6 +94,7 @@ if (HAVE_SRFI64)
gnc_add_swig_guile_command(swig-gnc-optiondb-guile gnc_add_swig_guile_command(swig-gnc-optiondb-guile
SWIG_GNC_OPTIONDB_GUILE_CPP swig-gnc-optiondb-guile.cpp SWIG_GNC_OPTIONDB_GUILE_CPP swig-gnc-optiondb-guile.cpp
${MODULEPATH}/gnc-optiondb.i ${MODULEPATH}/gnc-optiondb.i
""
) )
add_library(swig-gnc-optiondb MODULE add_library(swig-gnc-optiondb MODULE
${MODULEPATH}/gnc-option.cpp ${MODULEPATH}/gnc-option.cpp
@@ -102,6 +103,7 @@ if (HAVE_SRFI64)
) )
set(swig_gnc_optiondb_INCLUDES set(swig_gnc_optiondb_INCLUDES
${MODULEPATH} ${MODULEPATH}
${CMAKE_SOURCE_DIR}/bindings/guile
${CMAKE_SOURCE_DIR}/libgnucash/engine ${CMAKE_SOURCE_DIR}/libgnucash/engine
${CMAKE_BINARY_DIR}/common # for config.h ${CMAKE_BINARY_DIR}/common # for config.h
${GLIB2_INCLUDE_DIRS} ${GLIB2_INCLUDE_DIRS}
@@ -109,8 +111,9 @@ if (HAVE_SRFI64)
) )
set(swig_gnc_optiondb_LIBS set(swig_gnc_optiondb_LIBS
gncmod-engine gnc-engine
gncmod-app-utils gnc-app-utils
gnucash-guile
${GLIB2_LDFLAGS} ${GLIB2_LDFLAGS}
${GUILE_LDFLAGS} ${GUILE_LDFLAGS}
) )

1
po/POTFILES.in
View File

@@ -527,7 +527,6 @@ libgnucash/app-utils/gnc-exp-parser.c
libgnucash/app-utils/gnc-gsettings.c libgnucash/app-utils/gnc-gsettings.c
libgnucash/app-utils/gnc-helpers.c libgnucash/app-utils/gnc-helpers.c
libgnucash/app-utils/gnc-help-utils.c libgnucash/app-utils/gnc-help-utils.c
libgnucash/app-utils/gncmod-app-utils.c
libgnucash/app-utils/gnc-option.cpp libgnucash/app-utils/gnc-option.cpp
libgnucash/app-utils/gnc-optiondb.cpp libgnucash/app-utils/gnc-optiondb.cpp
libgnucash/app-utils/gnc-prefs-utils.c libgnucash/app-utils/gnc-prefs-utils.c