From 41d0590ebf7978248aed6daab6cd324ee0c035c5 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 6 Oct 2017 13:00:39 +0100 Subject: [PATCH 2/2] UNTESTED: Windows: Stop manipulating line numbering in versioninfo.rc If __LINE__ doesn't work in MSVC's resource compiler, then removing the #line directive altogether seems a simpler fix than redefining __LINE__ to the wrong value. Signed-off-by: Simon McVittie --- cmake/dbus/CMakeLists.txt | 1 - dbus/versioninfo.rc.in | 4 ---- 2 files changed, 5 deletions(-) diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 42674944..4b2eac3f 100644 --- a/cmake/dbus/CMakeLists.txt +++ b/cmake/dbus/CMakeLists.txt @@ -246,7 +246,6 @@ if (MSVC) configure_file(${DBUS_DIR}/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo.rc) list(APPEND libdbus_SOURCES versioninfo.rc) - set_source_files_properties(versioninfo.rc COMPILE_FLAGS "-D__LINE__=1") endif (MSVC) if(MSVC_IDE) diff --git a/dbus/versioninfo.rc.in b/dbus/versioninfo.rc.in index 354c3432..3b2b0186 100644 --- a/dbus/versioninfo.rc.in +++ b/dbus/versioninfo.rc.in @@ -12,10 +12,6 @@ /* This file is processed by configure to create versioninfo.rc */ -#line __LINE__ "versioninfo.rc.in" - - - VS_VERSION_INFO VERSIONINFO FILEVERSION @BUILD_FILEVERSION@ PRODUCTVERSION @BUILD_FILEVERSION@ -- 2.14.2