mirror of
https://github.com/Gnucash/gnucash.git
synced 2025-02-25 18:55:30 -06:00
Get cutecash/C++ to compile again.
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@22767 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
parent
679d59e445
commit
6b0ade1851
@ -80,6 +80,8 @@ ADD_DEFINITIONS (-DHAVE_CONFIG_H)
|
||||
SET (CONFIG_H ${CMAKE_CURRENT_BINARY_DIR}/config.h)
|
||||
CONFIGURE_FILE (${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake.in ${CONFIG_H})
|
||||
|
||||
SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/swig-runtime.h)
|
||||
|
||||
# ############################################################
|
||||
|
||||
# The subdirectories
|
||||
|
@ -25,6 +25,7 @@ SET (libgnc_core_utils_SOURCES
|
||||
gnc-gdate-utils.c
|
||||
gnc-gkeyfile-utils.c
|
||||
gnc-glib-utils.c
|
||||
gnc-guile-utils.c
|
||||
gnc-jalali.c
|
||||
gnc-locale-utils.c
|
||||
gnc-main.c
|
||||
@ -36,6 +37,16 @@ SET (libgnc_core_utils_SOURCES
|
||||
# Add dependency on config.h
|
||||
SET_SOURCE_FILES_PROPERTIES (${libgnc_core_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
|
||||
|
||||
# Command to generate the swig-runtime.h header
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${SWIG_RUNTIME_H}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
|
||||
COMMAND ${SWIG_EXECUTABLE} -guile -external-runtime ${SWIG_RUNTIME_H}
|
||||
)
|
||||
|
||||
# Add dependency on swig-runtime.h
|
||||
SET_SOURCE_FILES_PROPERTIES (gnc-guile-utils.c PROPERTIES OBJECT_DEPENDS ${SWIG_RUNTIME_H})
|
||||
|
||||
# Workaround to create a very simple gncla-dir.h file
|
||||
FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR}/gncla-dir.h "
|
||||
#define PREFIX \"${CMAKE_INSTALL_PREFIX}\"
|
||||
@ -46,7 +57,7 @@ FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR}/gncla-dir.h "
|
||||
#define LOCALE_DATADIRNAME \"share\"
|
||||
")
|
||||
|
||||
# Workaround to create a simple
|
||||
# Workaround to create a simple gnc-version.h file
|
||||
FILE (WRITE ${CMAKE_CURRENT_BINARY_DIR}/gnc-version.h "
|
||||
/* Autogenerated. Do not change. */
|
||||
#ifndef GNC_VERSION_H
|
||||
@ -66,6 +77,7 @@ SET (libgnc_core_utils_HEADERS
|
||||
gnc-gdate-utils.h
|
||||
gnc-gkeyfile-utils.h
|
||||
gnc-glib-utils.h
|
||||
gnc-guile-utils.h
|
||||
gnc-jalali.h
|
||||
gnc-locale-utils.h
|
||||
gnc-main.h
|
||||
|
@ -84,13 +84,6 @@ ADD_CUSTOM_COMMAND (
|
||||
# Add dependency on iso-4217-currencies.c
|
||||
SET_SOURCE_FILES_PROPERTIES (gnc-commodity.c PROPERTIES OBJECT_DEPENDS ${ISO_4217_C})
|
||||
|
||||
# Command to generate the swig-runtime.h header
|
||||
SET (SWIG_RUNTIME_H ${CMAKE_CURRENT_BINARY_DIR}/swig-runtime.h)
|
||||
ADD_CUSTOM_COMMAND (
|
||||
OUTPUT ${SWIG_RUNTIME_H}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
|
||||
COMMAND ${SWIG_EXECUTABLE} -guile -external-runtime ${SWIG_RUNTIME_H}
|
||||
)
|
||||
# Add dependency on swig-runtime.h
|
||||
SET_SOURCE_FILES_PROPERTIES (gnc-hooks.c engine-helpers.c kvp-scm.c glib-helpers.c PROPERTIES OBJECT_DEPENDS ${SWIG_RUNTIME_H})
|
||||
|
||||
|
@ -116,6 +116,7 @@ ENDIF (WITH_AQBANKING)
|
||||
TARGET_LINK_LIBRARIES (cutecash libgncmod-gtkmm)
|
||||
TARGET_LINK_LIBRARIES (cutecash engine gnc-module core-utils qof)
|
||||
|
||||
TARGET_LINK_LIBRARIES (cutecash ${GUILE_LIBRARY})
|
||||
TARGET_LINK_LIBRARIES (cutecash ${GLIBMM_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES (cutecash ${GCONF2_LIBRARIES})
|
||||
TARGET_LINK_LIBRARIES (cutecash ${GTHREAD_LIBRARIES} ${GOBJECT_LIBRARIES} ${GMODULE_LIBRARIES} ${GLIB2_LIBRARIES})
|
||||
|
@ -28,6 +28,7 @@
|
||||
#include <string.h>
|
||||
#include <glib/gi18n.h>
|
||||
#include <glib.h>
|
||||
#include <libguile.h>
|
||||
extern "C"
|
||||
{
|
||||
#include "gnc-module/gnc-module.h"
|
||||
|
@ -30,6 +30,7 @@ SET (libgnc_qof_SOURCES
|
||||
qof/qofreference.c
|
||||
qof/qofsession.c
|
||||
qof/qofutil.c
|
||||
qof/qof-string-cache.c
|
||||
)
|
||||
IF (WIN32)
|
||||
ADD_DEFINITIONS (-DOS_WIN32)
|
||||
@ -72,6 +73,7 @@ SET (libgnc_qof_HEADERS
|
||||
qof/qofsession.h
|
||||
qof/qofutil.h
|
||||
qof/qof-gobject.h
|
||||
qof/qof-string-cache.h
|
||||
)
|
||||
|
||||
ADD_LIBRARY (qof
|
||||
|
Loading…
Reference in New Issue
Block a user