From 2dfb5ff69bb87f17ed98219f354c545fe31300d3 Mon Sep 17 00:00:00 2001 From: Chengwei Yang Date: Fri, 28 Jun 2013 10:18:35 +0800 Subject: [PATCH] cmake: clean up libxml2 glue Signed-off-by: Chengwei Yang Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=66257 --- cmake/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 836f4b2..c674351 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -296,10 +296,9 @@ if("${sysname}" MATCHES ".*SOLARIS.*") endif(HAVE_CONSOLE_OWNER_FILE) endif("${sysname}" MATCHES ".*SOLARIS.*") -#AC_ARG_WITH(xml, AS_HELP_STRING([--with-xml=[libxml/expat]],[XML library to use])) -if(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND) - message(FATAL "Neither expat nor libxml2 found!") -endif(NOT LIBXML2_FOUND AND NOT EXPAT_FOUND) +if(NOT EXPAT_FOUND) + message(FATAL "expat not found!") +endif(NOT EXPAT_FOUND) SET(XML_LIB "Expat") SET(XML_LIBRARY ${EXPAT_LIBRARIES}) @@ -566,7 +565,6 @@ message(" installing system libs: ${DBUS_INSTALL_SYSTEM_LIBS} " message(" Building Doxygen docs: ${DBUS_ENABLE_DOXYGEN_DOCS} ") message(" Building XML docs: ${DBUS_ENABLE_XML_DOCS} ") #message(" Gettext libs (empty OK): ${INTLLIBS} ") -message(" Using XML parser: ${XML_LIB} ") message(" Daemon executable name: ${DBUS_DAEMON_NAME}") if (WIN32) message(" System bus address: ${DBUS_SYSTEM_BUS_DEFAULT_ADDRESS} ") -- 2.7.4