From 01f1743e5c51226c9ca19ed67be04442e91f6e2a Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Wed, 18 Oct 2017 08:23:06 +0200 Subject: [PATCH] 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 Bug:https://bugs.freedesktop.org/show_bug.cgi?id=102558 --- cmake/tools/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/tools/CMakeLists.txt b/cmake/tools/CMakeLists.txt index b430ce7e..cc392c8a 100644 --- a/cmake/tools/CMakeLists.txt +++ b/cmake/tools/CMakeLists.txt @@ -85,6 +85,8 @@ if(WIN32) set(DBUS_FILE_TYPE "VFT_APP") configure_file(${CMAKE_SOURCE_DIR}/../dbus/versioninfo.rc.in ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_INTERNAL_NAME}.rc) list(APPEND dbus_update_activation_environment_SOURCES ${CMAKE_CURRENT_BINARY_DIR}/versioninfo-${DBUS_INTERNAL_NAME}.rc) +endif() +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 -- 2.12.3