diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2011-09-22 19:31:38 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2011-09-22 19:33:32 +0200 |
| commit | 692baa9d6a990523f4d4e7f3297f0d012332035f (patch) | |
| tree | c99f71cc1d74a1ac4c9f8b69dc4d725474581e69 | |
| parent | 337d9432f23636dc9fa7b7f1ab7d02857ccd269e (diff) | |
| download | dbus-692baa9d6a990523f4d4e7f3297f0d012332035f.tar.gz | |
Simplified cmake xml parser dependencies.
Find either expat or libxml2 xml parser libraries, depending on -DDBUS_USE_EXPAT=ON|OFF
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41027
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
| -rw-r--r-- | cmake/CMakeLists.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 750e3f1a..f475876b 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -87,9 +87,8 @@ if (WIN32) include(Win32Macros) addExplorerWrapper(${CMAKE_PROJECT_NAME}) endif (WIN32) -find_package(LibXml2) -find_package(LibExpat) -find_package(X11) + +option (DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON) if(NOT WIN32) OPTION(DBUS_ENABLE_ABSTRACT_SOCKETS "enable support for abstract sockets" ON) @@ -100,6 +99,13 @@ OPTION(DBUS_DISABLE_ASSERTS "Disable assertion checking" OFF) option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF) +if (DBUS_USE_EXPAT) + find_package(LibExpat) +else () + find_package(LibXml2) +endif () +find_package(X11) + # analogous to AC_USE_SYSTEM_EXTENSIONS in configure.ac add_definitions(-D_POSIX_C_SOURCE=199309L -D_GNU_SOURCE) @@ -299,12 +305,6 @@ if(NOT LIBXML2_FOUND AND NOT LIBEXPAT_FOUND) message(FATAL "Neither expat nor libxml2 found!") endif(NOT LIBXML2_FOUND AND NOT LIBEXPAT_FOUND) -if(LIBEXPAT_FOUND) - OPTION(DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" ON) -else(LIBEXPAT_FOUND) - OPTION(DBUS_USE_EXPAT "Use expat (== ON) or libxml2 (==OFF)" OFF) -endif(LIBEXPAT_FOUND) - if(DBUS_USE_EXPAT) SET(XML_LIB "Expat") SET(XML_LIBRARY ${LIBEXPAT_LIBRARIES}) |