r21749 - gnucash/trunk - [Cutecash] Update libxml2 include path lookup.

Christian Stimming cstim at code.gnucash.org
Mon Dec 19 06:37:36 EST 2011


Author: cstim
Date: 2011-12-19 06:37:36 -0500 (Mon, 19 Dec 2011)
New Revision: 21749
Trac: http://svn.gnucash.org/trac/changeset/21749

Modified:
   gnucash/trunk/CMakeLists.txt
   gnucash/trunk/src/backend/xml/CMakeLists.txt
Log:
[Cutecash] Update libxml2 include path lookup.

Modified: gnucash/trunk/CMakeLists.txt
===================================================================
--- gnucash/trunk/CMakeLists.txt	2011-12-19 11:37:25 UTC (rev 21748)
+++ gnucash/trunk/CMakeLists.txt	2011-12-19 11:37:36 UTC (rev 21749)
@@ -44,6 +44,7 @@
 PKG_CHECK_MODULES (GMODULE gmodule-2.0>=2.20)
 PKG_CHECK_MODULES (GTHREAD gthread-2.0>=2.20)
 PKG_CHECK_MODULES (GLIBMM glibmm-2.4>=2.24)
+PKG_CHECK_MODULES (LIBXML2 libxml-2.0>=2.7.0)
 
 IF (MSVC)
   MESSAGE (STATUS "Hint: To create the import libraries for the gnome DLLs (e.g. gconf-2.lib), use the dlltool as follows: pexports bin/libgconf-2-4.dll > lib/libgconf-2.def ; dlltool -d lib/libgconf-2.def -D bin/libgconf-2-4.dll -l lib/gconf-2.lib")
@@ -53,9 +54,9 @@
   ADD_DEFINITIONS ( -DNOMINMAX )
 ENDIF (MSVC)
 
-# Libxml2
-FIND_PACKAGE (LibXml2 REQUIRED)
-FIND_PACKAGE (ZLIB REQUIRED)
+## Libxml2
+#FIND_PACKAGE (LibXml2 REQUIRED)
+#FIND_PACKAGE (ZLIB REQUIRED)
 
 IF (NOT GLIB2_FOUND)
    MESSAGE (SEND_ERROR "Glib2 not found, but is required")

Modified: gnucash/trunk/src/backend/xml/CMakeLists.txt
===================================================================
--- gnucash/trunk/src/backend/xml/CMakeLists.txt	2011-12-19 11:37:25 UTC (rev 21748)
+++ gnucash/trunk/src/backend/xml/CMakeLists.txt	2011-12-19 11:37:36 UTC (rev 21749)
@@ -6,7 +6,7 @@
 INCLUDE_DIRECTORIES (${GLIB2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${GUILE_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${LIBINTL_INCLUDE_PATH})
-INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIR})
+INCLUDE_DIRECTORIES (${LIBXML2_INCLUDE_DIRS})
 INCLUDE_DIRECTORIES (${REGEX_INCLUDE_PATH})
 INCLUDE_DIRECTORIES (${CMAKE_BINARY_DIR}/src ) # for config.h
 INCLUDE_DIRECTORIES (${CMAKE_SOURCE_DIR}/src ) # for gnc-ui.h



More information about the gnucash-changes mailing list