]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
cmake: only copy session.conf and system.conf into test data dir
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 24 Oct 2014 12:42:57 +0000 (13:42 +0100)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 24 Oct 2014 14:51:53 +0000 (16:51 +0200)
Historically, CMake used the glob *.conf.in whereas Autotools listed
the files explicitly. This used to be equivalent, but broke down
when we added example-*.conf.in which are just snippets rather than
complete configuration files (they're intended to go in session.d
or system.d, or otherwise get included by the main config file).

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=73689
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
cmake/test/CMakeLists.txt

index 13f639b1bb7fab04fc1363effa9142b346ee997e..a373458abc194baf7cb0e97a4257c72ed0757349 100644 (file)
@@ -158,7 +158,10 @@ ENDFOREACH(FILE_TYPE)
 MESSAGE(STATUS "Copying generated bus config files to test directory")
 set (OUTDIR ${CMAKE_BINARY_DIR}/test/data/valid-config-files)
 
-FILE(GLOB FILES "${CMAKE_SOURCE_DIR}/../bus/*.conf.in" )
+SET(FILES
+  "${CMAKE_SOURCE_DIR}/../bus/session.conf.in"
+  "${CMAKE_SOURCE_DIR}/../bus/system.conf.in"
+)
 FILE(MAKE_DIRECTORY ${OUTDIR})
 FOREACH(FILE ${FILES})
     GET_FILENAME_COMPONENT(FILENAME ${FILE} NAME)