Attachment 108353 Details for Bug 73689 – cmake: only copy session.conf and system.conf into test data dir

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

0004-cmake-only-copy-session.conf-and-system.conf-into-te.patch (text/plain), 1.33 KB, created by Simon McVittie on 2014-10-24 12:50:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2014-10-24 12:50:33 UTC

Size: 1.33 KB

patch

obsolete

>From 467a7f5d79097faa5d17326c7c446bc61705c5f6 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>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
>

Actions: View | Splinter Review

Attachments on bug 73689: 92216 | 92217 | 92295 | 107237 | 107446 | 107828 | 108323 | 108348 | 108352 | 108353

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.