Skip to content

Commit 5a61fa9

Browse files
committed
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-
1 parent 682e7b8 commit 5a61fa9

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

win/upgrade_wizard/CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ IF(CMAKE_USING_VC_FREE_TOOLS)
1111
ENDIF()
1212

1313
# We need MFC
14+
# /permissive- flag does not play well with MFC, disable it.
15+
STRING(REPLACE "/permissive-" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
16+
1417
FIND_PACKAGE(MFC)
1518
IF(NOT MFC_FOUND)
1619
IF(BUILD_RELEASE)

0 commit comments

Comments
 (0)