diff options
| author | Chengwei Yang <chengwei.yang@intel.com> | 2013-06-06 15:59:20 +0800 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-06 13:02:24 +0100 |
| commit | 46602768c537bfa51af80ba2c67857f3a30c0e67 (patch) | |
| tree | 2c89308feca98e65b74bbfa3e32edffa2c3e4b13 /cmake | |
| parent | 0a76508672de5c879c14c343f8e6cc041c1843d9 (diff) | |
| download | dbus-46602768c537bfa51af80ba2c67857f3a30c0e67.tar.gz | |
XML: hard depends on expat and delete libxml
[The libxml code path has been broken for at least 2.5 years, and Expat
is tiny, so there seems no point in supporting both. -smcv]
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=20253
Signed-off-by: Chengwei Yang <chengwei.yang@intel.com>
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | cmake/bus/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/modules/CPackInstallConfig.cmake | 9 |
3 files changed, 6 insertions, 30 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9c1ef2ec..ed1df562 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -89,8 +89,6 @@ if (WIN32) addExplorerWrapper(${CMAKE_PROJECT_NAME}) endif (WIN32) -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) set (CMAKE_THREAD_PREFER_PTHREAD ON) @@ -104,11 +102,7 @@ option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF) option (DBUS_ENABLE_STATS "enable bus daemon usage statistics" OFF) -if (DBUS_USE_EXPAT) - find_package(EXPAT) -else () - find_package(LibXml2) -endif () +find_package(EXPAT) find_package(X11) # analogous to AC_USE_SYSTEM_EXTENSIONS in configure.ac @@ -309,16 +303,9 @@ if(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND) message(FATAL "Neither expat nor libxml2 found!") endif(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND) -if(DBUS_USE_EXPAT) - SET(XML_LIB "Expat") - SET(XML_LIBRARY ${EXPAT_LIBRARIES}) - SET(XML_INCLUDE_DIR ${EXPAT_INCLUDE_DIR}) -else(DBUS_USE_EXPAT) - SET(XML_LIB "LibXML2") - SET(XML_LIBRARY ${LIBXML2_LIBRARIES}) - SET(XML_INCLUDE_DIR ${LIBXML2_INCLUDE_DIR}) -endif(DBUS_USE_EXPAT) - +SET(XML_LIB "Expat") +SET(XML_LIBRARY ${EXPAT_LIBRARIES}) +SET(XML_INCLUDE_DIR ${EXPAT_INCLUDE_DIR}) #AC_ARG_WITH(init-scripts, AS_HELP_STRING([--with-init-scripts=[redhat]],[Style of init scripts to install])) #AC_ARG_WITH(session-socket-dir, AS_HELP_STRING([--with-session-socket-dir=[dirname]],[Where to put sockets for the per-login-session message bus])) diff --git a/cmake/bus/CMakeLists.txt b/cmake/bus/CMakeLists.txt index 2657605e..f2ea55eb 100644 --- a/cmake/bus/CMakeLists.txt +++ b/cmake/bus/CMakeLists.txt @@ -29,11 +29,7 @@ FOREACH(FILE ${FILES}) configure_file(${FILE} ${TARGET} ) ENDFOREACH(FILE) -if(DBUS_USE_EXPAT) - SET (XML_SOURCES ${BUS_DIR}/config-loader-expat.c) -else(DBUS_USE_EXPAT) - SET (XML_SOURCES ${BUS_DIR}/config-loader-libxml.c) -endif (DBUS_USE_EXPAT) +SET (XML_SOURCES ${BUS_DIR}/config-loader-expat.c) # after next cvs update #set (DIR_WATCH_SOURCE ${BUS_DIR}/dir-watch-default.c) diff --git a/cmake/modules/CPackInstallConfig.cmake b/cmake/modules/CPackInstallConfig.cmake index f8073a25..74b66898 100644 --- a/cmake/modules/CPackInstallConfig.cmake +++ b/cmake/modules/CPackInstallConfig.cmake @@ -1,14 +1,7 @@ if (DBUS_INSTALL_SYSTEM_LIBS) if (MINGW) - if (DBUS_USE_EXPAT) - # expat - install_files(/bin FILES ${LIBEXPAT_LIBRARIES}) - else (DBUS_USE_EXPAT) - # xml2 - install_files(/bin FILES ${LIBXML2_LIBRARIES}) - install_files(/bin FILES ${LIBICONV_LIBRARIES}) - endif (DBUS_USE_EXPAT) + install_files(/bin FILES ${LIBEXPAT_LIBRARIES}) else (MINGW) INCLUDE(InstallRequiredSystemLibraries) endif (MINGW) |