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 95163cf3657f3d37afb3fd8234936f7edab8c74b (commit)
via 2b77b5328086d81cffb8ced0525afa6b4aad0da7 (commit)
from ffd3b271b526c65ae461258d3ee0a946d95a6e89 (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=95163cf3657f3d37afb3fd8234936f7edab8c74b
commit 95163cf3657f3d37afb3fd8234936f7edab8c74b
Merge: ffd3b27 2b77b53
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 2 10:42:47 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Dec 2 10:42:47 2013 -0500
Merge topic 'lang-flag-var-helpstrings' into next
2b77b53 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent
(#14606)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2b77b5328086d81cffb8ced0525afa6b4aad0da7
commit 2b77b5328086d81cffb8ced0525afa6b4aad0da7
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 2 10:41:12 2013 -0500
Commit: Brad King <[email protected]>
CommitDate: Mon Dec 2 10:41:12 2013 -0500
Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)
Use consistent capitalization and write all words out in the cache entry
descriptions.
diff --git a/Modules/CMakeCInformation.cmake b/Modules/CMakeCInformation.cmake
index f5a6277..e1e7d26 100644
--- a/Modules/CMakeCInformation.cmake
+++ b/Modules/CMakeCInformation.cmake
@@ -119,11 +119,11 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
set (CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG_INIT}" CACHE STRING
"Flags used by the compiler during debug builds.")
set (CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL_INIT}" CACHE STRING
- "Flags used by the compiler during release minsize builds.")
+ "Flags used by the compiler during release builds for minimum size.")
set (CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE_INIT}" CACHE STRING
"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.")
+ "Flags used by the compiler during release builds with debug info.")
endif()
if(CMAKE_C_STANDARD_LIBRARIES_INIT)
diff --git a/Modules/CMakeCXXInformation.cmake
b/Modules/CMakeCXXInformation.cmake
index cf86e74..a2cd4e0 100644
--- a/Modules/CMakeCXXInformation.cmake
+++ b/Modules/CMakeCXXInformation.cmake
@@ -209,11 +209,11 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
set (CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG_INIT}" CACHE STRING
"Flags used by the compiler during debug builds.")
set (CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL_INIT}" CACHE
STRING
- "Flags used by the compiler during release minsize builds.")
+ "Flags used by the compiler during release builds for minimum size.")
set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE_INIT}" CACHE STRING
"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.")
+ "Flags used by the compiler during release builds with debug info.")
endif()
diff --git a/Modules/CMakeFortranInformation.cmake
b/Modules/CMakeFortranInformation.cmake
index ac89bab..de40b2c 100644
--- a/Modules/CMakeFortranInformation.cmake
+++ b/Modules/CMakeFortranInformation.cmake
@@ -226,11 +226,11 @@ if(NOT CMAKE_NOT_USING_CONFIG_FLAGS)
set (CMAKE_Fortran_FLAGS_DEBUG "${CMAKE_Fortran_FLAGS_DEBUG_INIT}" CACHE
STRING
"Flags used by the compiler during debug builds.")
set (CMAKE_Fortran_FLAGS_MINSIZEREL "${CMAKE_Fortran_FLAGS_MINSIZEREL_INIT}"
CACHE STRING
- "Flags used by the compiler during release minsize builds.")
+ "Flags used by the compiler during release builds for minimum size.")
set (CMAKE_Fortran_FLAGS_RELEASE "${CMAKE_Fortran_FLAGS_RELEASE_INIT}" CACHE
STRING
"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.")
+ "Flags used by the compiler during release builds with debug info.")
endif()
-----------------------------------------------------------------------
Summary of changes:
Modules/CMakeCInformation.cmake | 4 ++--
Modules/CMakeCXXInformation.cmake | 4 ++--
Modules/CMakeFortranInformation.cmake | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
