summaryrefslogtreecommitdiff
path: root/cmake/modules
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-06-06 15:59:20 +0800
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-06-06 13:02:24 +0100
commit46602768c537bfa51af80ba2c67857f3a30c0e67 (patch)
tree2c89308feca98e65b74bbfa3e32edffa2c3e4b13 /cmake/modules
parent0a76508672de5c879c14c343f8e6cc041c1843d9 (diff)
downloaddbus-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/modules')
-rw-r--r--cmake/modules/CPackInstallConfig.cmake9
1 files changed, 1 insertions, 8 deletions
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)