From c04f63030be9d745a0b62b122c56cfffd746d82a 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 A related manifest is added by default for msvc versions >= 8.0 (see https://github.com/Kitware/CMake/blob/master/Modules/Platform/Windows-MSVC.cmake#L270 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, 1 insertion(+), 1 deletion(-) 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 -- 2.12.3