[Cmake-commits] CMake branch, next, updated. v2.8.12-4224-g6aa1225

[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  6aa1225938ede14f55dd97342ab1fe3e65a1fc47 (commit)
       via  b9fe4b6318905ff7ccea4f66aece6bb54688777c (commit)
      from  4a074c3adc4b54f570d6f0fb636cbdd717fd5a98 (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=6aa1225938ede14f55dd97342ab1fe3e65a1fc47
commit 6aa1225938ede14f55dd97342ab1fe3e65a1fc47
Merge: 4a074c3 b9fe4b6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 21 10:22:32 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Oct 21 10:22:32 2013 -0400

    Merge topic 'doc-vs-keyword-properties' into next
    
    b9fe4b6 VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b9fe4b6318905ff7ccea4f66aece6bb54688777c
commit b9fe4b6318905ff7ccea4f66aece6bb54688777c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Oct 21 10:07:46 2013 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Oct 21 10:07:46 2013 -0400

    VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493)
    
    These two target properties serve the same purpose for different versions
    of Visual Studio.  Document the versions covered by each property.
    
    Reported-by: mar.na at t-online.de

diff --git a/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst b/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
index 072475f..ce49316 100644
--- a/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
+++ b/Help/prop_tgt/VS_GLOBAL_KEYWORD.rst
@@ -1,9 +1,12 @@
 VS_GLOBAL_KEYWORD
 -----------------
 
-Visual Studio project keyword.
+Visual Studio project keyword for VS 10 (2010) and newer.
 
 Sets the "keyword" attribute for a generated Visual Studio project.
 Defaults to "Win32Proj".  You may wish to override this value with
 "ManagedCProj", for example, in a Visual Studio managed C++ unit test
 project.
+
+Use the :prop_tgt:`VS_KEYWORD` target property to set the
+keyword for Visual Studio 9 (2008) and older.
diff --git a/Help/prop_tgt/VS_KEYWORD.rst b/Help/prop_tgt/VS_KEYWORD.rst
index aa8e206..6c2e042 100644
--- a/Help/prop_tgt/VS_KEYWORD.rst
+++ b/Help/prop_tgt/VS_KEYWORD.rst
@@ -1,7 +1,10 @@
 VS_KEYWORD
 ----------
 
-Visual Studio project keyword.
+Visual Studio project keyword for VS 9 (2008) and older.
 
 Can be set to change the visual studio keyword, for example Qt
 integration works better if this is set to Qt4VSv1.0.
+
+Use the :prop_tgt:`VS_GLOBAL_KEYWORD` target property to set the
+keyword for Visual Studio 10 (2010) and newer.

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

Summary of changes:
 Help/prop_tgt/VS_GLOBAL_KEYWORD.rst |    5 ++++-
 Help/prop_tgt/VS_KEYWORD.rst        |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake