diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 19:29:52 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-22 19:29:52 +0100 |
| commit | b8af22af15d159b32256f7d5be8324871ae1a104 (patch) | |
| tree | 402a26f282e91562b17c07c12d3d6c017d63ef87 /win | |
| parent | 868bca5c4fca7ca3fcddf9195800bc1ef5988885 (diff) | |
| parent | e92cc097658405fdb52c80254b933424f8c1f99e (diff) | |
| download | mariadb-git-b8af22af15d159b32256f7d5be8324871ae1a104.tar.gz | |
Merge branch '10.2' into bb-10.2-ext
Diffstat (limited to 'win')
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index dc4ef67387d..5f415e4960d 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -24,7 +24,7 @@ ELSE() SET(CMAKE_MFC_FLAG 1) ENDIF() # Enable exception handling (avoids warnings) -SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc -DNO_WARN_MBCS_MFC_DEPRECATION") INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/sql) MYSQL_ADD_EXECUTABLE(mysql_upgrade_wizard |