r22767 - gnucash/trunk/src - Get cutecash/C++ to compile again.

Christian Stimming cstim at code.gnucash.org
Fri Feb 8 15:47:43 EST 2013


Author: cstim
Date: 2013-02-08 15:47:42 -0500 (Fri, 08 Feb 2013)
New Revision: 22767
Trac: http://svn.gnucash.org/trac/changeset/22767

Modified:
   gnucash/trunk/src/CMakeLists.txt
   gnucash/trunk/src/core-utils/CMakeLists.txt
   gnucash/trunk/src/engine/CMakeLists.txt
   gnucash/trunk/src/gnc/CMakeLists.txt
   gnucash/trunk/src/gnc/main.cpp
   gnucash/trunk/src/libqof/CMakeLists.txt
Log:
Get cutecash/C++ to compile again.

Modified: gnucash/trunk/src/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/CMakeLists.txt	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/CMakeLists.txt	2013-02-08 20:47:42 UTC (rev 22767)
@@ -80,6 +80,8 @@
 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

Modified: gnucash/trunk/src/core-utils/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/core-utils/CMakeLists.txt	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/core-utils/CMakeLists.txt	2013-02-08 20:47:42 UTC (rev 22767)
@@ -25,6 +25,7 @@
   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 @@
 # 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 @@
 #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 @@
   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

Modified: gnucash/trunk/src/engine/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/engine/CMakeLists.txt	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/engine/CMakeLists.txt	2013-02-08 20:47:42 UTC (rev 22767)
@@ -84,13 +84,6 @@
 # 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})
 

Modified: gnucash/trunk/src/gnc/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/gnc/CMakeLists.txt	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/gnc/CMakeLists.txt	2013-02-08 20:47:42 UTC (rev 22767)
@@ -116,6 +116,7 @@
 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})

Modified: gnucash/trunk/src/gnc/main.cpp
===================================================================
--- gnucash/trunk/src/gnc/main.cpp	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/gnc/main.cpp	2013-02-08 20:47:42 UTC (rev 22767)
@@ -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"

Modified: gnucash/trunk/src/libqof/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/libqof/CMakeLists.txt	2013-02-08 11:02:55 UTC (rev 22766)
+++ gnucash/trunk/src/libqof/CMakeLists.txt	2013-02-08 20:47:42 UTC (rev 22767)
@@ -30,6 +30,7 @@
    qof/qofreference.c
    qof/qofsession.c
    qof/qofutil.c
+   qof/qof-string-cache.c
 )
 IF (WIN32)
   ADD_DEFINITIONS (-DOS_WIN32)
@@ -72,6 +73,7 @@
    qof/qofsession.h
    qof/qofutil.h
    qof/qof-gobject.h
+   qof/qof-string-cache.h
 )
 
 ADD_LIBRARY	(qof



More information about the gnucash-changes mailing list