From 1c6debfd8a9ff6c5c6ee734cd9cc5aa0746df812 Mon Sep 17 00:00:00 2001 From: Christian Stimming Date: Mon, 19 Dec 2011 11:37:36 +0000 Subject: [PATCH] [Cutecash] Update libxml2 include path lookup. git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@21749 57a11ea4-9604-0410-9ed3-97b8803252fd --- CMakeLists.txt | 7 ++++--- src/backend/xml/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4601cce9d..e03178e0a7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,7 @@ PKG_CHECK_MODULES (GOBJECT gobject-2.0>=2.20) 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 @@ IF (MSVC) 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") diff --git a/src/backend/xml/CMakeLists.txt b/src/backend/xml/CMakeLists.txt index f12a3a6c91..6061d88336 100644 --- a/src/backend/xml/CMakeLists.txt +++ b/src/backend/xml/CMakeLists.txt @@ -6,7 +6,7 @@ INCLUDE_DIRECTORIES (${GCONF2_INCLUDE_DIRS}) 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