[Cmake-commits] CMake branch, next, updated. v2.8.12.1-5957-gffd3b27

[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  ffd3b271b526c65ae461258d3ee0a946d95a6e89 (commit)
       via  424c6fcc76d6efebefd6ec9538308353dad94f60 (commit)
      from  4ae250616b49637de1d8651fa71612a3971b9e94 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ffd3b271b526c65ae461258d3ee0a946d95a6e89
commit ffd3b271b526c65ae461258d3ee0a946d95a6e89
Merge: 4ae2506 424c6fc
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 2 10:27:35 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 2 10:27:35 2013 -0500

    Merge topic 'lang-flag-var-helpstrings' into next
    
    424c6fc Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=424c6fcc76d6efebefd6ec9538308353dad94f60
commit 424c6fcc76d6efebefd6ec9538308353dad94f60
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 2 10:25:52 2013 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Dec 2 10:25:52 2013 -0500

    Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
    
    Remove the platform-specific description from the cache entry help
    strings for these variables.

diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index 0f5b694..f5a6277 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -121,7 +121,7 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
   set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
     "Flags used by the compiler during release minsize builds.")
   set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT}" CACHE STRING
-    "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
+    "Flags used by the compiler during release builds.")
   set (CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
     "Flags used by the compiler during Release with Debug Info builds.")
 endif()
diff --git a/Modules/CMakeCXXInformation.cmake b/Modules/CMakeCXXInformation.cmake
index 9cf3489..cf86e74 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -211,7 +211,7 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
   set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE STRING
       "Flags used by the compiler during release minsize builds.")
   set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING
-     "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
+     "Flags used by the compiler during release builds.")
   set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
      "Flags used by the compiler during Release with Debug Info builds.")
 
diff --git a/Modules/CMakeFortranInformation.cmake b/Modules/CMakeFortranInformation.cmake
index debfd46..ac89bab 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -228,7 +228,7 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
   set (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}" CACHE STRING
       "Flags used by the compiler during release minsize builds.")
   set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE STRING
-     "Flags used by the compiler during release builds (/MD /Ob1 /Oi /Ot /Oy /Gs will produce slightly less optimized but smaller files).")
+     "Flags used by the compiler during release builds.")
   set (CMAKE_Fortran_FLAGS_RELWITHDEBINFO "${CMAKE_Fortran_FLAGS_RELWITHDEBINFO_INIT}" CACHE STRING
      "Flags used by the compiler during Release with Debug Info builds.")
 

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

Summary of changes:
 Modules/CMakeCInformation.cmake       |    2 +-
 Modules/CMakeCXXInformation.cmake     |    2 +-
 Modules/CMakeFortranInformation.cmake |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake