From: Simon McVittie Date: Fri, 6 Oct 2017 12:00:39 +0000 (+0100) Subject: Windows: Stop manipulating line numbering in versioninfo.rc X-Git-Tag: dbus-1.12.0~22 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=afae60ec6fd1d167f5713fa911d0719db1d5701c;p=platform%2Fupstream%2Fdbus.git 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 Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015 Reviewed-by: Ralf Habacker --- diff --git a/cmake/dbus/CMakeLists.txt b/cmake/dbus/CMakeLists.txt index 4267494..4b2eac3 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 354c343..3b2b018 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@