diff options
| author | Vladislav Vaintroub <wlad@mariadb.com> | 2017-03-30 13:11:34 +0000 |
|---|---|---|
| committer | Vladislav Vaintroub <wlad@mariadb.com> | 2017-04-02 17:29:04 +0000 |
| commit | 0cca5bdf0b6d9b1562e7a92ae51d983d2a63a1f0 (patch) | |
| tree | ff5dc1a0723ec9e9d986ff5b96153321729a9632 /win/upgrade_wizard | |
| parent | 099ba3465e5f93351a5d265e0ef59ab0f3dcb260 (diff) | |
| download | mariadb-git-0cca5bdf0b6d9b1562e7a92ae51d983d2a63a1f0.tar.gz | |
Allow to specify C runtime library used for compilation.
Default to static release (previously static debug was used in debug
builds, but not is appears to be too slow)
Diffstat (limited to 'win/upgrade_wizard')
| -rw-r--r-- | win/upgrade_wizard/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/win/upgrade_wizard/CMakeLists.txt b/win/upgrade_wizard/CMakeLists.txt index 44d6249ea1e..dc4ef67387d 100644 --- a/win/upgrade_wizard/CMakeLists.txt +++ b/win/upgrade_wizard/CMakeLists.txt @@ -16,10 +16,13 @@ IF(NOT MFC_FOUND) ENDIF() RETURN() ENDIF() - -# MFC should be statically linked -SET(CMAKE_MFC_FLAG 1) - +IF(MSVC_CRT_TYPE MATCHES "/MD") + # MFC should be dynamically linked + SET(CMAKE_MFC_FLAG 2) +ELSE() + # MFC should be statically linked + SET(CMAKE_MFC_FLAG 1) +ENDIF() # Enable exception handling (avoids warnings) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc") |