cmake: install missing files to keep in sync with autotools builds

diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt
index d689adf6b67c2842fd283876ed4323eb06008db4..e4c00db005a631bcb9cefe184f0933bf85471c8e 100644 (file)
--- a/bus/CMakeLists.txt
+++ b/bus/CMakeLists.txt
@@ -150,6 +150,19 @@ if(MSVC)
     project_source_group(${GROUP_CODE} bus_test_SOURCES dummy)
 endif()
 
+configure_file(example-session-disable-stats.conf.in ${CMAKE_CURRENT_BINARY_DIR}/example-session-disable-stats.conf)
+set(EXAMPLES_DATA
+    ${CMAKE_CURRENT_BINARY_DIR}/example-session-disable-stats.conf
+)
+if(NOT WIN32)
+    configure_file(example-system-enable-stats.conf.in ${CMAKE_CURRENT_BINARY_DIR}/example-system-enable-stats.conf)
+    list(APPEND EXAMPLES_DATA
+        ${CMAKE_CURRENT_BINARY_DIR}/example-system-enable-stats.conf
+    )
+endif()
+
+install(FILES ${EXAMPLES_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/examples)
+
 ## mop up the gcov files
 #clean-local:
 #      /bin/rm *.bb *.bbg *.da *.gcov || true

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index e9d17214ef66f38425a05d240f133e809da5bcc3..d7879fe1b3c4c98df44361e9bbc9ca50ba6f8e26 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -152,6 +152,22 @@ docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml htm
 configure_file(index.html.in ${CMAKE_CURRENT_BINARY_DIR}/index.html)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/index.html DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
 
+#
+# misc files
+#
+set(DTD_DATA
+    diagram.png
+    diagram.svg
+)
+
+install(FILES ${DTD_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
+
+set(DOC_DATA
+    system-activation.txt
+)
+
+install(FILES ${DOC_DATA} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
+
 set(EXTRA_DIST
     busconfig.dtd
     introspect.dtd

diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index ffa3013ec66f20dde7ffde8280497b88a9de4d76..8cde1ffe0c799fc705e9d1c2e98099fa0ab65a80 100644 (file)
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -109,3 +109,9 @@ install(TARGETS dbus-run-session ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 # create the /var/lib/dbus directory for dbus-uuidgen
 install(DIRECTORY DESTINATION ${CMAKE_INSTALL_LOCALSTATEDIR}/lib/dbus)
+
+set(EXAMPLES_SCRIPTS
+    GetAllMatchRules.py
+)
+
+install(FILES ${EXAMPLES_SCRIPTS} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/examples)