diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-10-24 13:42:57 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2014-10-24 16:51:53 +0200 |
| commit | 8fd6e561dfb3f4ae888d1777c84d24fcb2483dff (patch) | |
| tree | cde2096f1adcb9aa8244cb40dc31c2149583fc66 | |
| parent | 4564754a2f2df5919b755cbd3321498517be67a1 (diff) | |
cmake: only copy session.conf and system.conf into test data dir
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>
| -rw-r--r-- | cmake/test/CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index 13f639b1..a373458a 100644 --- a/cmake/test/CMakeLists.txt +++ b/cmake/test/CMakeLists.txt @@ -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) |