diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-02-23 08:43:34 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-02-23 08:43:34 +0100 |
| commit | 2732fcc608eb98345f79ba805842ab02272d49cf (patch) | |
| tree | e7273c809f44432e5f60a55d5b8f35253d49963d /win/upgrade_wizard | |
| parent | 131d9a5d0cb51fa88a0461c939dfd2a7c68d5664 (diff) | |
| parent | b8af22af15d159b32256f7d5be8324871ae1a104 (diff) | |
| download | mariadb-git-2732fcc608eb98345f79ba805842ab02272d49cf.tar.gz | |
Merge branch 'bb-10.2-ext' into 10.3
Diffstat (limited to 'win/upgrade_wizard')
| -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 1285a5f41b7..2186a79f732 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -28,7 +28,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 |