fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-08 04:40:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not add custom UAC related manifest to cmake builds for MSVC on Windows

Browse source 
MSVC compiler >= 8.0 (VS 2005) add an identical manifest (with uac level
set to 'asInvoker' specified by /MANIFEST) by default to generated binaries
(see https://msdn.microsoft.com/en-us/library/f2c0w594.aspx for details).

Signed-off-by: Ralf Habacker <ralf.habacker@freenet.de>
Reviewed-by: Simon McVittie <smcv@collabora.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=102558
This commit is contained in:
Ralf Habacker 2017-10-18 08:23:06 +02:00 • committed by Simon McVittie
parent 6ad07c4c6d
commit b23dc40ce3
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/tools/CMakeLists.txt
View file

@ -62,7 +62,7 @@ add_executable(dbus-test-tool ${dbus_test_tool_SOURCES})
target_link_libraries(dbus-test-tool ${DBUS_LIBRARIES})
install(TARGETS dbus-test-tool ${INSTALL_TARGETS_DEFAULT_ARGS})
if(WIN32)
if(WIN32 AND NOT MSVC)
# avoid dbus-update-activation-environment triggering UAC
# 1 is the resource ID, ID_MANIFEST
# 24 is the resource type, RT_MANIFEST