From 5a61fa9882747dfc4ea71f8f3b58d2a0479f1d58 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Wed, 30 May 2018 21:37:51 +0000 Subject: [PATCH] MDEV-16345 : No upgrade wizard in 10.3 in Windows packages. Disable /permissive- flag, so MFC is found, and upgrade_wizard is built. MFC code is not standard C++, so it doesn not play well with /permissive- --- win/upgrade_wizard/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index 2186a79f732..81c9c0d572c 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -11,6 +11,9 @@ IF(CMAKE_USING_VC_FREE_TOOLS) ENDIF() # We need MFC +# /permissive- flag does not play well with MFC, disable it. +STRING(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + FIND_PACKAGE(MFC) IF(NOT MFC_FOUND) IF(BUILD_RELEASE)