Attachment 134886 Details for Bug 103015 – Add version info to dbus-1 target for non msvc builds on Windows too

[patch] Add version info to dbus-1 target for non msvc builds on Windows too

Add-version-info-to-dbus-1-target-for-non-msvc-bui.patch (text/plain), 1.42 KB, created by Ralf Habacker on 2017-10-17 19:10:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2017-10-17 19:10:14 UTC

Size: 1.42 KB

patch

obsolete

>From b583f7826991423d40d37efffe6bbd8024419d60 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Tue, 17 Oct 2017 20:56:12 +0200
>Subject: [PATCH] Add version info to dbus-1 target for non msvc builds on
> Windows too
>
>Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015
>---
> cmake/dbus/CMakeLists.txt | 13 ++++++-------
> 1 file changed, 6 insertions(+), 7 deletions(-)
>
>diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt
>index 4b2eac3f..8a01d918 100644
>--- a/cmake/dbus/CMakeLists.txt
>+++ b/cmake/dbus/CMakeLists.txt
>@@ -240,13 +240,12 @@ set(libdbus_HEADERS
> 	${DBUS_LIB_HEADERS}
> 	${DBUS_SHARED_HEADERS}
> )
>-if (MSVC)
>-    set (BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_VERSION},${DBUS_PATCH_VERSION})
>-    set (BUILD_TIMESTAMP ${DBUS_BUILD_TIMESTAMP})
>-    
>-    configure_file(${DBUS_DIR}/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
>-    list(APPEND libdbus_SOURCES versioninfo.rc)
>-endif (MSVC)
>+
>+set (BUILD_FILEVERSION ${DBUS_MAJOR_VERSION},${DBUS_MINOR_VERSION},${DBUS_MICRO_VERSION},${DBUS_PATCH_VERSION})
>+set (BUILD_TIMESTAMP ${DBUS_BUILD_TIMESTAMP})
>+
>+configure_file(${DBUS_DIR}/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc)
>+list(APPEND libdbus_SOURCES versioninfo.rc)
> 
> if(MSVC_IDE)
> 	project_source_group(${GROUP_CODE} DBUS_LIB_SOURCES DBUS_LIB_HEADERS)
>-- 
>2.12.3

Actions: View | Splinter Review

Attachments on bug 103015: 134523 | 134534 | 134535 | 134536 | 134537 | 134544 | 134545 | 134546 | 134565 | 134695 | 134696 | 134703 | 134704 | 134716 | 134719 | 134882 | 134883 | 134885 | 134886 | 134887 | 134909 | 134910 | 134911 | 134913 | 134924

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.