diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2017-10-18 08:23:06 +0200 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-10-23 11:07:17 +0100 |
| commit | b23dc40ce3cdadd7f48a55a944cfd1f7841dfae0 (patch) | |
| tree | 003ee32f1c4211cf191aecc0f7d590baf5943b04 /cmake | |
| parent | 6ad07c4c6d016305c03cd52f4da7c29bf543c52c (diff) | |
| download | dbus-b23dc40ce3cdadd7f48a55a944cfd1f7841dfae0.tar.gz dbus-b23dc40ce3cdadd7f48a55a944cfd1f7841dfae0.tar.bz2 dbus-b23dc40ce3cdadd7f48a55a944cfd1f7841dfae0.zip | |
Do not add custom UAC related manifest to cmake builds for MSVC on Windows
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
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/tools/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt index 5613269e..c05ced43 100644 --- a/cmake/tools/CMakeLists.txt +++ b/cmake/tools/CMakeLists.txt @@ -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 |