mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-21 23:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS

Browse Source
This commit is contained in:
Michael Stürmer
2017-01-09 16:32:22 +01:00
parent 7f5842d7d9
commit 6fda6005b3
5 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Help/manual/cmake-properties.7.rst
+1 -1
View File
@@ -291,7 +291,7 @@ Properties on Targets
/prop_tgt/VS_SCC_PROJECTNAME /prop_tgt/VS_SCC_PROJECTNAME
/prop_tgt/VS_SCC_PROVIDER /prop_tgt/VS_SCC_PROVIDER
/prop_tgt/VS_SDK_REFERENCES /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_WINDOWS_TARGET_PLATFORM_MIN_VERSION
/prop_tgt/VS_WINRT_COMPONENT /prop_tgt/VS_WINRT_COMPONENT
/prop_tgt/VS_WINRT_EXTENSIONS /prop_tgt/VS_WINRT_EXTENSIONS
Help/prop_tgt/VS_USER_PROPS_CXX.rst → Help/prop_tgt/VS_USER_PROPS.rst
+2 -2
View File
@@ -1,5 +1,5 @@
VS_USER_PROPS_CXX VS_USER_PROPS
----------------- -------------
Sets the user props file to be included in the visual studio Sets the user props file to be included in the visual studio
C++ project file. The standard path is C++ project file. The standard path is
Help/release/dev/vs-custom-msbuild-props.rst
+1 -1
View File
@@ -3,7 +3,7 @@ vs-custom-msbuild-props
* The :ref:`Visual Studio Generators` for VS 2010 and above can * The :ref:`Visual Studio Generators` for VS 2010 and above can
now be fine tuned using custom msbuild .props files. 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 used to change the default path of the user .props file from
``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`` to ``$(UserRootDir)\\Microsoft.Cpp.$(Platform).user.props`` to
an arbitrary filename. an arbitrary filename.
Source/cmVisualStudio10TargetGenerator.cxx
+1 -2
View File
@@ -385,8 +385,7 @@ void cmVisualStudio10TargetGenerator::Generate()
this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1); this->WriteString("<ImportGroup Label=\"PropertySheets\">\n", 1);
{ {
std::string props = VS10_CXX_USER_PROPS; std::string props = VS10_CXX_USER_PROPS;
if (const char* p = if (const char* p = this->GeneratorTarget->GetProperty("VS_USER_PROPS")) {
this->GeneratorTarget->GetProperty("VS_USER_PROPS_CXX")) {
props = p; props = p;
this->ConvertToWindowsSlash(props); this->ConvertToWindowsSlash(props);
} }
Tests/RunCMake/VS10Project/VsCustomProps.cmake
+1 -1
View File
@@ -4,4 +4,4 @@ add_library(foo foo.cpp)
set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props") set(props_file "${CMAKE_CURRENT_SOURCE_DIR}/my.props")
set_target_properties(foo PROPERTIES set_target_properties(foo PROPERTIES
VS_USER_PROPS_CXX "${props_file}") VS_USER_PROPS "${props_file}")