diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-10-06 13:00:39 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-10-06 13:00:39 +0100 |
| commit | 41d0590ebf7978248aed6daab6cd324ee0c035c5 (patch) | |
| tree | c3f6206753390f88537a00d4188802d8fb66a1c8 | |
| parent | 77e6472d2fadff31b576411025230beda944e34d (diff) | |
UNTESTED: Windows: Stop manipulating line numbering in versioninfo.rcuntested-cmake-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>
| -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@ |