summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-22 13:07:51 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-22 13:07:51 (GMT)
commit5db203d6be8e1132429dd364c0fe8c34eb1835ba (patch)
tree24a93b9d8f99a13d11ba53a7ccaa08bb837081e4
parent0d9e8b1ab9ff8c99700093ba76a4339e3f199350 (diff)
parentb9fe4b6318905ff7ccea4f66aece6bb54688777c (diff)
downloadCMake-5db203d6be8e1132429dd364c0fe8c34eb1835ba.zip
CMake-5db203d6be8e1132429dd364c0fe8c34eb1835ba.tar.gz
CMake-5db203d6be8e1132429dd364c0fe8c34eb1835ba.tar.bz2
Merge topic 'doc-vs-keyword-properties'
b9fe4b6 VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493)
-rw-r--r--Help/prop_tgt/VS_GLOBAL_KEYWORD.rst5
-rw-r--r--Help/prop_tgt/VS_KEYWORD.rst5
2 files changed, 8 insertions, 2 deletions
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.