diff options
| author | Michael Stürmer <michael.stuermer@schaeffler.com> | 2017-01-09 15:32:22 (GMT) |
|---|---|---|
| committer | Michael Stürmer <michael.stuermer@schaeffler.com> | 2017-01-13 08:27:21 (GMT) |
| commit | 6fda6005b306cc4a1e9e9e66d9cd4525fc623f73 (patch) | |
| tree | 002cb3a31b34ccf475849f2fdb353bc23ac68ba0 | |
| parent | 7f5842d7d943403fca02a5345e9d6f779eb7bf9a (diff) | |
| download | CMake-6fda6005b306cc4a1e9e9e66d9cd4525fc623f73.zip CMake-6fda6005b306cc4a1e9e9e66d9cd4525fc623f73.tar.gz CMake-6fda6005b306cc4a1e9e9e66d9cd4525fc623f73.tar.bz2 | |
VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
| -rw-r--r-- | Help/manual/cmake-properties.7.rst | 2 | ||||
| -rw-r--r-- | Help/prop_tgt/VS_USER_PROPS.rst (renamed from Help/prop_tgt/VS_USER_PROPS_CXX.rst) | 4 | ||||
| -rw-r--r-- | Help/release/dev/vs-custom-msbuild-props.rst | 2 | ||||
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/VS10Project/VsCustomProps.cmake | 2 |
5 files changed, 6 insertions, 7 deletions
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_CXX.rst b/Help/prop_tgt/VS_USER_PROPS.rst index 083ce03..1be222b 100644 --- a/Help/prop_tgt/VS_USER_PROPS_CXX.rst +++ b/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 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}") |