gnucash master: Get cutecash to compile/link again.
Christian Stimming
cstim at code.gnucash.org
Wed Oct 5 16:21:11 EDT 2016
Updated via https://github.com/Gnucash/gnucash/commit/6e132d83 (commit)
from https://github.com/Gnucash/gnucash/commit/87ed53b3 (commit)
commit 6e132d83fd0a65e6606a405e60d76027b2edf6e4
Author: Christian Stimming <christian at cstimming.de>
Date: Wed Oct 5 22:18:46 2016 +0200
Get cutecash to compile/link again.
To my surprise the C++/Qt executable still compiles, links, and run.
diff --git a/src/backend/xml/CMakeLists.txt b/src/backend/xml/CMakeLists.txt
index c6882a7..26f4642 100644
--- a/src/backend/xml/CMakeLists.txt
+++ b/src/backend/xml/CMakeLists.txt
@@ -120,6 +120,14 @@ INSTALL(TARGETS gncmod-backend-xml
# ----
+# Special normal (non-MODULE) library for cutecash only
+ADD_LIBRARY(gncmod-backend-xml-utils ${libgncmod_backend_xml_SOURCES})
+TARGET_LINK_LIBRARIES(gncmod-backend-xml-utils gnc-backend-xml-utils gncmod-engine
+ gnc-core-utils ${LIBXML2_LDFLAGS} ${GLIB2_LDFLAGS} ${ZLIB_LIBRARY})
+TARGET_COMPILE_DEFINITIONS (gncmod-backend-xml-utils PRIVATE -DG_LOG_DOMAIN=\"gnc.backend.xml\" -DU_SHOW_CPLUSPLUS_API=0)
+
+# ----
+
# FIXME: Below is a hack to create .libs/libgncmod-backend-xml to silence some complaints
# from guile when compiling. Eventually, fix the guile module loader to not expect items
# to be in .libs. At this time, WIN32 does not use guile-2, so no need for this.
diff --git a/src/gnc/CMakeLists.txt b/src/gnc/CMakeLists.txt
index 87e16ba..156d578 100644
--- a/src/gnc/CMakeLists.txt
+++ b/src/gnc/CMakeLists.txt
@@ -103,19 +103,19 @@ ADD_EXECUTABLE (cutecash
${gnc_SOURCES}
)
-TARGET_LINK_LIBRARIES (cutecash gnc-backend-xml)
-TARGET_LINK_LIBRARIES (cutecash gnc-import)
-TARGET_LINK_LIBRARIES (cutecash app-utils)
+TARGET_LINK_LIBRARIES (cutecash gncmod-backend-xml-utils gnc-backend-xml-utils)
+TARGET_LINK_LIBRARIES (cutecash gncmod-generic-import)
+TARGET_LINK_LIBRARIES (cutecash gncmod-app-utils)
IF (WITH_SQL)
- TARGET_LINK_LIBRARIES (cutecash gnc-backend-dbi gnc-backend-sql)
+ TARGET_LINK_LIBRARIES (cutecash gncmod-backend-dbi gnc-backend-sql)
TARGET_LINK_LIBRARIES (cutecash ${LIBDBI_LIBRARY})
ENDIF (WITH_SQL)
IF (WITH_AQBANKING)
- TARGET_LINK_LIBRARIES (cutecash gnc-aqbanking)
+ TARGET_LINK_LIBRARIES (cutecash gncmod-aqbanking)
# TARGET_LINK_LIBRARIES (cutecash ${AQBANKING_LIBRARIES} ${GWENHYWFAR_LIBRARIES})
ENDIF (WITH_AQBANKING)
TARGET_LINK_LIBRARIES (cutecash libgncmod-gtkmm)
-TARGET_LINK_LIBRARIES (cutecash engine gnc-module core-utils qof)
+TARGET_LINK_LIBRARIES (cutecash gncmod-engine gnc-module gnc-core-utils gnc-qof)
TARGET_LINK_LIBRARIES (cutecash ${GUILE_LIBRARY} ${GUILE_LIBRARIES})
TARGET_LINK_LIBRARIES (cutecash ${GLIBMM_LIBRARIES})
diff --git a/src/gnc/QofEventWrapper.hpp b/src/gnc/QofEventWrapper.hpp
index dc25741..10379fa 100644
--- a/src/gnc/QofEventWrapper.hpp
+++ b/src/gnc/QofEventWrapper.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h" // required by qof/qofutil.h
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/gnc/Session.hpp b/src/gnc/Session.hpp
index 6010eb4..6e1650c 100644
--- a/src/gnc/Session.hpp
+++ b/src/gnc/Session.hpp
@@ -26,6 +26,7 @@
// gnucash includes
#include "config.h" // required by qof/qofutil.h
#include <glib/gi18n.h>
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/gnc/dashboard.hpp b/src/gnc/dashboard.hpp
index 80a3ff6..a4a88a7 100644
--- a/src/gnc/dashboard.hpp
+++ b/src/gnc/dashboard.hpp
@@ -23,6 +23,7 @@
#define DASHBOARD_HPP
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
diff --git a/src/gnc/fpo/ViewletModel.hpp b/src/gnc/fpo/ViewletModel.hpp
index bbfa940..59b550c 100644
--- a/src/gnc/fpo/ViewletModel.hpp
+++ b/src/gnc/fpo/ViewletModel.hpp
@@ -5,6 +5,7 @@
#include <QtGui>
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
diff --git a/src/gnc/fpo/ViewletView.hpp b/src/gnc/fpo/ViewletView.hpp
index bca568a..173f6fa 100644
--- a/src/gnc/fpo/ViewletView.hpp
+++ b/src/gnc/fpo/ViewletView.hpp
@@ -2,6 +2,7 @@
#define VIEWLETVIEW_HPP
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
diff --git a/src/gnc/main.cpp b/src/gnc/main.cpp
index 7b4f00b..dc0bce4 100644
--- a/src/gnc/main.cpp
+++ b/src/gnc/main.cpp
@@ -29,6 +29,7 @@
#include <glib/gi18n.h>
#include <glib.h>
#include <libguile.h>
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "gnc-module/gnc-module.h"
diff --git a/src/optional/gtkmm/gncmm/Account.hpp b/src/optional/gtkmm/gncmm/Account.hpp
index 61a8874..efd53f1 100644
--- a/src/optional/gtkmm/gncmm/Account.hpp
+++ b/src/optional/gtkmm/gncmm/Account.hpp
@@ -24,6 +24,7 @@
#define GNC_ACCOUNT_HPP
// gnucash includes
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/Book.hpp b/src/optional/gtkmm/gncmm/Book.hpp
index 0bc18fc..41ad8b7 100644
--- a/src/optional/gtkmm/gncmm/Book.hpp
+++ b/src/optional/gtkmm/gncmm/Book.hpp
@@ -24,6 +24,7 @@
#define GNC_BOOK_HPP
// gnucash includes
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/Commodity.hpp b/src/optional/gtkmm/gncmm/Commodity.hpp
index e5e59b4..e944eba 100644
--- a/src/optional/gtkmm/gncmm/Commodity.hpp
+++ b/src/optional/gtkmm/gncmm/Commodity.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/GncInstance.hpp b/src/optional/gtkmm/gncmm/GncInstance.hpp
index 2bdc28d..641c029 100644
--- a/src/optional/gtkmm/gncmm/GncInstance.hpp
+++ b/src/optional/gtkmm/gncmm/GncInstance.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/Numeric.hpp b/src/optional/gtkmm/gncmm/Numeric.hpp
index 699e8da..b621450 100644
--- a/src/optional/gtkmm/gncmm/Numeric.hpp
+++ b/src/optional/gtkmm/gncmm/Numeric.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/Split.hpp b/src/optional/gtkmm/gncmm/Split.hpp
index 101ecca..2fc40a5 100644
--- a/src/optional/gtkmm/gncmm/Split.hpp
+++ b/src/optional/gtkmm/gncmm/Split.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
diff --git a/src/optional/gtkmm/gncmm/Transaction.hpp b/src/optional/gtkmm/gncmm/Transaction.hpp
index a650502..c921739 100644
--- a/src/optional/gtkmm/gncmm/Transaction.hpp
+++ b/src/optional/gtkmm/gncmm/Transaction.hpp
@@ -25,6 +25,7 @@
// gnucash includes
#include "config.h"
+#include "libqof/qof/guid.hpp"
extern "C"
{
#include "qof.h"
Summary of changes:
src/backend/xml/CMakeLists.txt | 8 ++++++++
src/gnc/CMakeLists.txt | 12 ++++++------
src/gnc/QofEventWrapper.hpp | 1 +
src/gnc/Session.hpp | 1 +
src/gnc/dashboard.hpp | 1 +
src/gnc/fpo/ViewletModel.hpp | 1 +
src/gnc/fpo/ViewletView.hpp | 1 +
src/gnc/main.cpp | 1 +
src/optional/gtkmm/gncmm/Account.hpp | 1 +
src/optional/gtkmm/gncmm/Book.hpp | 1 +
src/optional/gtkmm/gncmm/Commodity.hpp | 1 +
src/optional/gtkmm/gncmm/GncInstance.hpp | 1 +
src/optional/gtkmm/gncmm/Numeric.hpp | 1 +
src/optional/gtkmm/gncmm/Split.hpp | 1 +
src/optional/gtkmm/gncmm/Transaction.hpp | 1 +
15 files changed, 27 insertions(+), 6 deletions(-)
More information about the gnucash-changes
mailing list