Do not add custom UAC related manifest to cmake builds for MSVC on Windows
authorRalf Habacker <ralf.habacker@freenet.de>
Wed, 18 Oct 2017 06:23:06 +0000 (08:23 +0200)
committerSimon McVittie <smcv@collabora.com>
Mon, 23 Oct 2017 10:07:17 +0000 (11:07 +0100)
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

cmake/tools/CMakeLists.txt

index 5613269..c05ced4 100644 (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