diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-17 10:20:16 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-06-17 10:20:16 -0400 |
| commit | 4160d68189c83da60156a3a65edbd322dca0fa90 (patch) | |
| tree | 1fa20437aedf28e6c697750792d2068190e64883 | |
| parent | 9f3546bbb44e23b97ea226fce155330eb352f75b (diff) | |
| parent | 78249be29d0b9c187c5e459d636a8704ab3956eb (diff) | |
| download | cmake-4160d68189c83da60156a3a65edbd322dca0fa90.tar.gz | |
Merge branch 'revert-vs-clang-minsize' into release
| -rw-r--r-- | Modules/Platform/Windows-MSVC.cmake | 2 | ||||
| -rw-r--r-- | Source/cmVS14CLFlagTable.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake index 1920a7c61d..6c254ede44 100644 --- a/Modules/Platform/Windows-MSVC.cmake +++ b/Modules/Platform/Windows-MSVC.cmake @@ -305,7 +305,7 @@ macro(__windows_compiler_msvc lang) set(CMAKE_${lang}_FLAGS_DEBUG_INIT "-D_DEBUG /MDd -gline-tables-only -fno-inline -O0 ${_RTC1}") set(CMAKE_${lang}_FLAGS_RELEASE_INIT "/MD -O2 -DNDEBUG") set(CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT "/MD -gline-tables-only -O2 -fno-inline -DNDEBUG") - set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD -Os -DNDEBUG") + set(CMAKE_${lang}_FLAGS_MINSIZEREL_INIT "/MD -DNDEBUG") # TODO: Add '-Os' once VS generator maps it properly for Clang else() set(CMAKE_${lang}_FLAGS_INIT "${_PLATFORM_DEFINES}${_PLATFORM_DEFINES_${lang}} /D_WINDOWS /W3${_FLAGS_${lang}}") set(CMAKE_${lang}_FLAGS_DEBUG_INIT "/D_DEBUG /MDd /Zi /Ob0 /Od ${_RTC1}") diff --git a/Source/cmVS14CLFlagTable.h b/Source/cmVS14CLFlagTable.h index 4243f30d1b..5812e79e85 100644 --- a/Source/cmVS14CLFlagTable.h +++ b/Source/cmVS14CLFlagTable.h @@ -16,7 +16,6 @@ static cmVS7FlagTable cmVS14CLFlagTable[] = { { "Optimization", "", "Custom", "Custom", 0 }, { "Optimization", "Od", "Disabled", "Disabled", 0 }, - { "Optimization", "Os", "Minimize Size", "MinSize", 0 }, { "Optimization", "O1", "Minimize Size", "MinSpace", 0 }, { "Optimization", "O2", "Maximize Speed", "MaxSpeed", 0 }, { "Optimization", "Ox", "Full Optimization", "Full", 0 }, |