diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-30 21:37:51 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2018-05-30 21:37:51 +0000 |
| commit | 5a61fa9882747dfc4ea71f8f3b58d2a0479f1d58 (patch) | |
| tree | f55c5d0930c302bf6c4c20028d14300dfb3c6b0a /win | |
| parent | 682e7b8ff48f9fca3219814fb0f06e09d5a7d346 (diff) | |
| download | mariadb-git-5a61fa9882747dfc4ea71f8f3b58d2a0479f1d58.tar.gz | |
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-
Diffstat (limited to 'win')
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 3 |
1 files changed, 3 insertions, 0 deletions
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) |