[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3311-g29decf3

[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  29decf333f846abbe66c93c88e662d41c5c5edc3 (commit)
       via  41bb95fc673d3c5a151dcca82638fc1d7cec15ee (commit)
       via  52daa0ea34195fba893e61e72030df4840baa425 (commit)
      from  096f93491eef96d0bbb25dfd7541aa19aff2118e (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=29decf333f846abbe66c93c88e662d41c5c5edc3
commit 29decf333f846abbe66c93c88e662d41c5c5edc3
Merge: 096f934 41bb95f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jul 24 10:32:00 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 10:32:00 2013 -0400

    Merge topic 'doc-CMAKE_lang_FLAGS' into next
    
    41bb95f Document CMAKE_<LANG>_FLAGS variable (#14305)
    52daa0e CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41bb95fc673d3c5a151dcca82638fc1d7cec15ee
commit 41bb95fc673d3c5a151dcca82638fc1d7cec15ee
Author:     Sebastian Leske <sebastian.leske at sleske.name>
AuthorDate: Tue Jul 23 18:20:00 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jul 24 10:30:34 2013 -0400

    Document CMAKE_<LANG>_FLAGS variable (#14305)
    
    We already document the variables CMAKE_<LANG>_FLAGS_{DEBUG, MINSIZEREL,
    RELEASE, RELWITHDEBINFO}. However, CMAKE_<LANG>_FLAGS is not documented,
    even though it's available (and useful).

diff --git a/Source/cmDocumentVariables.cxx b/Source/cmDocumentVariables.cxx
index fcaa169..cfd5e76 100644
--- a/Source/cmDocumentVariables.cxx
+++ b/Source/cmDocumentVariables.cxx
@@ -1622,6 +1622,12 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
      "Variables for Languages");
 
   cm->DefineProperty
+     ("CMAKE_<LANG>_FLAGS", cmProperty::VARIABLE,
+      "Flags for all build types.",
+      "<LANG> flags used regardless of the value of CMAKE_BUILD_TYPE.",false,
+      "Variables for Languages");
+
+  cm->DefineProperty
     ("CMAKE_<LANG>_FLAGS_DEBUG", cmProperty::VARIABLE,
      "Flags for Debug build type or configuration.",
      "<LANG> flags used when CMAKE_BUILD_TYPE is Debug.",false,
@@ -1862,8 +1868,6 @@ void cmDocumentVariables::DefineVariables(cmake* cm)
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_CREATE_PREPROCESSED_SOURCE",
                      cmProperty::VARIABLE,0,0);
-  cm->DefineProperty("CMAKE_<LANG>_FLAGS",
-                     cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_FLAGS_DEBUG_INIT",
                      cmProperty::VARIABLE,0,0);
   cm->DefineProperty("CMAKE_<LANG>_FLAGS_INIT",

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

Summary of changes:
 Source/CMakeVersion.cmake      |    2 +-
 Source/cmDocumentVariables.cxx |    8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake