From 467a7f5d79097faa5d17326c7c446bc61705c5f6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 24 Oct 2014 13:42:57 +0100 Subject: [PATCH 4/4] 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 --- cmake/test/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/test/CMakeLists.txt b/cmake/test/CMakeLists.txt index fb3b31e..5e81e7f 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) -- 2.1.1