diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-10-06 13:00:39 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2017-10-17 20:24:11 +0200 |
| commit | afae60ec6fd1d167f5713fa911d0719db1d5701c (patch) | |
| tree | 08355c7850f1990633204cca16cd5e22d8d61013 | |
| parent | d03c6d1131b70996d585ecd5b99c6d011ca262e3 (diff) | |
| download | dbus-afae60ec6fd1d167f5713fa911d0719db1d5701c.tar.gz | |
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 <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=103015
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
| -rw-r--r-- | cmake/dbus/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | dbus/versioninfo.rc.in | 4 |
2 files changed, 0 insertions, 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@ |