From 6fda6005b306cc4a1e9e9e66d9cd4525fc623f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20St=C3=BCrmer?= <michael.stuermer@schaeffler.com>
Date: Mon, 9 Jan 2017 16:32:22 +0100
Subject: VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS

---
 Help/manual/cmake-properties.7.rst             |  2 +-
 Help/prop_tgt/VS_USER_PROPS.rst                | 12 ++++++++++++
 Help/prop_tgt/VS_USER_PROPS_CXX.rst            | 12 ------------
 Help/release/dev/vs-custom-msbuild-props.rst   |  2 +-
 Source/cmVisualStudio10TargetGenerator.cxx     |  3 +--
 Tests/RunCMake/VS10Project/VsCustomProps.cmake |  2 +-
 6 files changed, 16 insertions(+), 17 deletions(-)
 create mode 100644 Help/prop_tgt/VS_USER_PROPS.rst
 delete mode 100644 Help/prop_tgt/VS_USER_PROPS_CXX.rst

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index c93ace1..864d1dc 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -291,7 +291,7 @@ Properties on Targets
    /prop_tgt/VS_SCC_PROJECTNAME
    /prop_tgt/VS_SCC_PROVIDER
    /prop_tgt/VS_SDK_REFERENCES
-   /prop_tgt/VS_USER_PROPS_CXX
+   /prop_tgt/VS_USER_PROPS
    /prop_tgt/VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION
    /prop_tgt/VS_WINRT_COMPONENT
    /prop_tgt/VS_WINRT_EXTENSIONS
diff --git a/Help/prop_tgt/VS_USER_PROPS.rst b/Help/prop_tgt/VS_USER_PROPS.rst
new file mode 100644
index 0000000..1be222b
--- /dev/null
+++ b/Help/prop_tgt/VS_USER_PROPS.rst
@@ -0,0 +1,12 @@
+VS_USER_PROPS
+-------------
+
+Sets the user props file to be included in the visual studio
+C++ project file. The standard path is
+``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props``, which is
+in most cases the same as
+``%LOCALAPPDATA%\\Microsoft\\MSBuild\\v4.0\\Microsoft.Cpp.Win32.user.props``
+or ``%LOCALAPPDATA%\\Microsoft\\MSBuild\\v4.0\\Microsoft.Cpp.x64.user.props``.
+
+The ``*.user.props`` files can be used for Visual Studio wide
+configuration which is independent from cmake.
diff --git a/Help/prop_tgt/VS_USER_PROPS_CXX.rst b/Help/prop_tgt/VS_USER_PROPS_CXX.rst
deleted file mode 100644
index 083ce03..0000000
--- a/Help/prop_tgt/VS_USER_PROPS_CXX.rst
+++ /dev/null
@@ -1,12 +0,0 @@
-VS_USER_PROPS_CXX
------------------
-
-Sets the user props file to be included in the visual studio
-C++ project file. The standard path is
-``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props``, which is
-in most cases the same as
-``%LOCALAPPDATA%\\Microsoft\\MSBuild\\v4.0\\Microsoft.Cpp.Win32.user.props``
-or ``%LOCALAPPDATA%\\Microsoft\\MSBuild\\v4.0\\Microsoft.Cpp.x64.user.props``.
-
-The ``*.user.props`` files can be used for Visual Studio wide
-configuration which is independent from cmake.
diff --git a/Help/release/dev/vs-custom-msbuild-props.rst b/Help/release/dev/vs-custom-msbuild-props.rst
index 15a5b0a..68dae42 100644
--- a/Help/release/dev/vs-custom-msbuild-props.rst
+++ b/Help/release/dev/vs-custom-msbuild-props.rst
@@ -3,7 +3,7 @@ vs-custom-msbuild-props
 
 * The :ref:`Visual Studio Generators` for VS 2010 and above can
   now be fine tuned using custom msbuild .props files.
-  :prop_tgt:`VS_USER_PROPS_CXX` can be
+  :prop_tgt:`VS_USER_PROPS` can be
   used to change the default path of the user .props file from
   ``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`` to
   an arbitrary filename.
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 49274c0..dff6ad6 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -385,8 +385,7 @@ void cmVisualStudio10TargetGenerator::Generate()
   this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
   {
     std::string props = VS10_CXX_USER_PROPS;
-    if (const char* p =
-          this->GeneratorTarget->GetProperty("VS_USER_PROPS_CXX")) {
+    if (const char* p = this->GeneratorTarget->GetProperty("VS_USER_PROPS")) {
       props = p;
       this->ConvertToWindowsSlash(props);
     }
diff --git a/Tests/RunCMake/VS10Project/VsCustomProps.cmake b/Tests/RunCMake/VS10Project/VsCustomProps.cmake
index af52a3e..fbbcfcf 100644
--- a/Tests/RunCMake/VS10Project/VsCustomProps.cmake
+++ b/Tests/RunCMake/VS10Project/VsCustomProps.cmake
@@ -4,4 +4,4 @@ add_library(foo foo.cpp)
 set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props")
 
 set_target_properties(foo PROPERTIES
-    VS_USER_PROPS_CXX "${props_file}")
+    VS_USER_PROPS "${props_file}")
-- 
cgit v0.12