diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-09-12 12:16:40 +0300 |
| commit | 60c04be6599597548ad07ce11e1d7d4004a7cc9c (patch) | |
| tree | 491f1b7b65b82ed270e5af34db4d4cebf760e501 /cmake/os/Windows.cmake | |
| parent | ebddd8699c02519f99a313182b96ae1c04a67a63 (diff) | |
| parent | 9554ef067878c4650ef4b9ad44e0b222cdb313a5 (diff) | |
| download | mariadb-git-60c04be6599597548ad07ce11e1d7d4004a7cc9c.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'cmake/os/Windows.cmake')
| -rw-r--r-- | cmake/os/Windows.cmake | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cmake/os/Windows.cmake b/cmake/os/Windows.cmake index 86d7d1280ae..02687b6f0d5 100644 --- a/cmake/os/Windows.cmake +++ b/cmake/os/Windows.cmake @@ -195,11 +195,18 @@ IF(MSVC) IF(MYSQL_MAINTAINER_MODE MATCHES "ERR") SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") + FOREACH(type EXE SHARED MODULE) + FOREACH(cfg RELEASE DEBUG RELWITHDEBINFO) + SET(CMAKE_${type}_LINKER_FLAGS_${cfg} "${CMAKE_${type}_LINKER_FLAGS_${cfg}} /WX") + ENDFOREACH() + ENDFOREACH() ENDIF() IF(MSVC_VERSION LESS 1910) # Noisy warning C4800: 'type': forcing value to bool 'true' or 'false' (performance warning), # removed in VS2017 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800") + ELSE() + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /d2OptimizeHugeFunctions") ENDIF() ENDIF() |