fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-06-04 03:58:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cmake: only copy session.conf and system.conf into test data dir

Browse source 
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>
This commit is contained in:
Simon McVittie 2014-10-24 13:42:57 +01:00 • committed by Ralf Habacker
parent 4564754a2f
commit 8fd6e561df
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmake/test/CMakeLists.txt
View 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)