r18743 - gnucash/trunk/src - Also build backend/xml in cmake.

Christian Stimming cstim at code.gnucash.org
Sat Feb 27 06:37:15 EST 2010 

Author: cstim
Date: 2010-02-27 06:37:14 -0500 (Sat, 27 Feb 2010)
New Revision: 18743
Trac: http://svn.gnucash.org/trac/changeset/18743

Added:
   gnucash/trunk/src/backend/xml/CMakeLists.txt
Modified:
   gnucash/trunk/src/CMakeLists.txt
   gnucash/trunk/src/core-utils/CMakeLists.txt
   gnucash/trunk/src/engine/CMakeLists.txt
   gnucash/trunk/src/gnc-module/CMakeLists.txt
   gnucash/trunk/src/libqof/CMakeLists.txt
   gnucash/trunk/src/test-core/CMakeLists.txt
   gnucash/trunk/src/test-core/test-main.c
Log:
Also build backend/xml in cmake.

Modified: gnucash/trunk/src/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -21,13 +21,21 @@
    MESSAGE (SEND_ERROR "pkg-config not found, but is required")
 ENDIF (NOT PKG_CONFIG_FOUND)
 
-# glib
+# glib et al.
 PKG_CHECK_MODULES (GLIB2 glib-2.0>=2.20.0)
 PKG_CHECK_MODULES (GCONF2 gconf-2.0>=2.0)
 PKG_CHECK_MODULES (GOBJECT gobject-2.0>=2.20.0)
 PKG_CHECK_MODULES (GMODULE gmodule-2.0>=2.20.0)
 PKG_CHECK_MODULES (GTHREAD gthread-2.0>=2.20.0)
 
+IF (MSVC)
+  MESSAGE (STATUS "To create the import libraries for the gnome DLLs (e.g. gconf-2.lib), use the dlltool as follows: dlltool -D libgconf-2-4.dll -l ../lib/gconf-2.lib")
+ENDIF (MSVC)
+
+# Libxml2
+FIND_PACKAGE (LibXml2 REQUIRED)
+FIND_PACKAGE (ZLIB REQUIRED)
+
 IF (NOT GLIB2_FOUND)
    MESSAGE (SEND_ERROR "Glib2 not found, but is required")
 ENDIF (NOT GLIB2_FOUND)
@@ -200,5 +208,6 @@
 ADD_SUBDIRECTORY (core-utils)
 ADD_SUBDIRECTORY (gnc-module)
 ADD_SUBDIRECTORY (engine)
+ADD_SUBDIRECTORY (backend/xml)
 
 ADD_SUBDIRECTORY (test-core)

Added: gnucash/trunk/src/backend/xml/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/backend/xml/CMakeLists.txt	                        (rev 0)
+++ gnucash/trunk/src/backend/xml/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -0,0 +1,54 @@
+# CMakeLists.txt for src/backend/xml
+
+ADD_DEFINITIONS (-DG_LOG_DOMAIN=\"gnc.backend.xml\")
+
+INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
+INCLUDE_DIRECTORIES (${LIBGUILE_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR} ) # for config.h
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}) # for gnc-ui.h
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/../lib/libc) # for gnc-ui.h
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/libqof/qof)
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/core-utils)
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/gnc-module)
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/engine)
+INCLUDE_DIRECTORIES (${CMAKE_CURRENT_SOURCE_DIR}) # when building swig-gnc-module.c
+
+# Command to generate the swig-engine.c wrapper file
+SET (SWIG_GNC_MODULE_C ${CMAKE_CURRENT_BINARY_DIR}/swig-gnc-module.c)
+GNC_ADD_SWIG_COMMAND (${SWIG_GNC_MODULE_C} ${CMAKE_CURRENT_SOURCE_DIR}/gnc-module.i)
+
+SET (libgnc_backend_xml_SOURCES
+  gnc-account-xml-v2.c 
+  gnc-book-xml-v2.c 
+  gnc-budget-xml-v2.c 
+  gnc-commodity-xml-v2.c 
+  gnc-freqspec-xml-v2.c 
+  gnc-lot-xml-v2.c 
+  gnc-pricedb-xml-v2.c 
+  gnc-recurrence-xml-v2.c 
+  gnc-schedxaction-xml-v2.c 
+  gnc-transaction-xml-v2.c 
+  io-example-account.c 
+  io-gncxml-gen.c 
+  io-gncxml-v1.c 
+  io-gncxml-v2.c 
+  io-utils.c 
+  sixtp-dom-generators.c 
+  sixtp-dom-parsers.c 
+  sixtp-stack.c 
+  sixtp-to-dom-parser.c 
+  sixtp-utils.c 
+  sixtp.c
+  gnc-backend-xml.c
+)
+
+# Add dependency on config.h
+SET_SOURCE_FILES_PROPERTIES (${libgnc_backend_xml_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+
+ADD_LIBRARY	(gnc-backend-xml
+  ${libgnc_backend_xml_SOURCES}
+  )

Modified: gnucash/trunk/src/core-utils/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/core-utils/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/core-utils/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -24,6 +24,9 @@
   ${SWIG_CORE_UTILS_C}
 )
 
+# Add dependency on config.h
+SET_SOURCE_FILES_PROPERTIES (${libgnc_core_utils_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+
 SET (libgnc_core_utils_HEADERS
   gnc-main.h
   gnc-gconf-utils.h

Modified: gnucash/trunk/src/engine/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/engine/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/engine/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -129,6 +129,9 @@
   ${SWIG_ENGINE_C}
 )
 
+# Add dependency on config.h
+SET_SOURCE_FILES_PROPERTIES (${libgncmod_engine_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+
 ADD_LIBRARY	(engine
   ${libgncmod_engine_SOURCES}
   ${libgncmod_engine_HEADERS}

Modified: gnucash/trunk/src/gnc-module/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/gnc-module/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/gnc-module/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -19,6 +19,9 @@
   ${SWIG_GNC_MODULE_C}
 )
 
+# Add dependency on config.h
+SET_SOURCE_FILES_PROPERTIES (${libgnc_module_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+
 SET (libgnc_module_HEADERS
   gnc-module.h
   gnc-module-api.h

Modified: gnucash/trunk/src/libqof/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/libqof/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/libqof/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -50,6 +50,9 @@
   )
 ENDIF (WIN32)
 
+# Add dependency on config.h
+SET_SOURCE_FILES_PROPERTIES (${libgnc_qof_SOURCES} PROPERTIES OBJECT_DEPENDS ${CONFIG_H})
+
 SET (libgnc_qof_HEADERS
    qof/gnc-date.h
    qof/gnc-date-p.h

Modified: gnucash/trunk/src/test-core/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/test-core/CMakeLists.txt	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/test-core/CMakeLists.txt	2010-02-27 11:37:14 UTC (rev 18743)
@@ -22,12 +22,15 @@
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/gnc-module) # for gnc-glib-utils.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/core-utils) # for gnc-glib-utils.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/engine) # for gnc-glib-utils.h
+INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/backend/xml)
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/engine) # for swig-runtime.h
 
-TARGET_LINK_LIBRARIES (test-main engine gnc-module core-utils qof)
-TARGET_LINK_LIBRARIES (test-main ${GCONF_LIBRARIES})
+TARGET_LINK_LIBRARIES (test-main gnc-backend-xml engine gnc-module core-utils qof)
+TARGET_LINK_LIBRARIES (test-main ${GCONF2_LIBRARIES})
 TARGET_LINK_LIBRARIES (test-main ${GTHREAD_LIBRARIES} ${GOBJECT_LIBRARIES} ${GMODULE_LIBRARIES} ${GLIB2_LIBRARIES})
 TARGET_LINK_LIBRARIES (test-main ${LIBGUILE_LIBRARIES})
+TARGET_LINK_LIBRARIES (test-main ${LIBXML2_LIBRARIES})
+TARGET_LINK_LIBRARIES (test-main ${ZLIB_LIBRARIES})
 IF (WIN32)
   TARGET_LINK_LIBRARIES (test-main ${LIBINTL_LIBRARY} ${REGEX_LIBRARY})
 ENDIF (WIN32)

Modified: gnucash/trunk/src/test-core/test-main.c
===================================================================
--- gnucash/trunk/src/test-core/test-main.c	2010-02-27 02:03:38 UTC (rev 18742)
+++ gnucash/trunk/src/test-core/test-main.c	2010-02-27 11:37:14 UTC (rev 18743)
@@ -41,6 +41,8 @@
 #include "engine-helpers.h"
 #include "swig-runtime.h"
 
+#include "gnc-backend-xml.h"
+
 #ifdef HAVE_GETTEXT
 #  include <libintl.h>
 #  include <locale.h>
@@ -159,6 +161,8 @@
 
     gnc_module_system_init();
 
+	qof_backend_module_init();
+
 /*     gnc_gnome_init (argc, argv, VERSION); */
 /*     gnc_gui_init(); */
 /*     scm_boot_guile(argc, argv, inner_main, 0); */

More information about the gnucash-changes mailing list