Просмотр исходного кода

VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS

Michael Stürmer 9 лет назад
Родитель
Сommit
6fda6005b3

+ 1 - 1
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

+ 2 - 2
Help/prop_tgt/VS_USER_PROPS_CXX.rst → Help/prop_tgt/VS_USER_PROPS.rst

@@ -1,5 +1,5 @@
-VS_USER_PROPS_CXX
------------------
+VS_USER_PROPS
+-------------
 
 Sets the user props file to be included in the visual studio
 C++ project file. The standard path is

+ 1 - 1
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.

+ 1 - 2
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);
     }

+ 1 - 1
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}")