From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 23 Apr 2020 16:37:54 +0000 (+0200)
Subject: cmake: fix installation of example files
X-Git-Tag: dbus-1.13.18~4^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d5fd3d76f794b9bfdebb57345f79a796885e79f1;p=thirdparty%2Fdbus.git

cmake: fix installation of example files
---

diff --git a/bus/CMakeLists.txt b/bus/CMakeLists.txt
index 84d86125f..f56bbb859 100644
--- a/bus/CMakeLists.txt
+++ b/bus/CMakeLists.txt
@@ -154,19 +154,21 @@ 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
-)
+macro(install_example_in_file a)
+    configure_file(${a}.in ${CMAKE_CURRENT_BINARY_DIR}/${a})
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${a} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/examples)
+endmacro()
+
+macro(install_example_file a)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${a} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus/examples)
+endmacro()
+
+install_example_in_file(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
-    )
+    install_example_in_file(example-system-enable-stats.conf)
+    install_example_file(example-system-hardening-without-traditional-activation.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