[Cmake-commits] CMake branch, next, updated. v3.6.0-rc2-358-gef0d8c3

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  ef0d8c3e5f5d46a183d9a65b38d05ccff8c991dc (commit)
       via  78249be29d0b9c187c5e459d636a8704ab3956eb (commit)
      from  85bdd3582b2a771107b1552c978aac50deff0868 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ef0d8c3e5f5d46a183d9a65b38d05ccff8c991dc
commit ef0d8c3e5f5d46a183d9a65b38d05ccff8c991dc
Merge: 85bdd35 78249be
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 17 10:20:07 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jun 17 10:20:07 2016 -0400

    Merge topic 'revert-vs-clang-minsize' into next
    
    78249be2 VS: Fix regressed mapping for the cl `/Os` compiler flag


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78249be29d0b9c187c5e459d636a8704ab3956eb
commit 78249be29d0b9c187c5e459d636a8704ab3956eb
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jun 17 10:04:34 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jun 17 10:18:47 2016 -0400

    VS: Fix regressed mapping for the cl `/Os` compiler flag
    
    In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct
    compiler settings, 2016-02-18) a flag mapping was added for the clang
    `-Os` flag.  However, this collides with a mapping we already had for
    the MSVC flag of the same name.  This is a symptom of a larger problem
    in that the VS generators need a per-toolset flag map (issue #16153).
    
    For now, simply drop the new mapping and drop `-Os` from clang compiler
    flags in the MinSizeRel configuration.
    
    Reported-by: Felix Bruns <felixbruns at gmail.com>

diff --git a/Modules/Platform/Windows-MSVC.cmake b/Modules/Platform/Windows-MSVC.cmake
index 1920a7c..6c254ed 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 4243f30..5812e79 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 },

-----------------------------------------------------------------------

Summary of changes:
 Modules/Platform/Windows-MSVC.cmake |    2 +-
 Source/cmVS14CLFlagTable.h          |    1 -
 2 files changed, 1 insertion(+), 2 deletions(-)


hooks/post-receive
-- 
CMake