diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-18 13:01:36 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-18 13:01:48 (GMT) |
| commit | b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565 (patch) | |
| tree | cca98eb61f39604776d35cf96dc78872246a8f8b /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | c867981c9d9bc8548d34f726940cd50b8d05d71c (diff) | |
| parent | e7d57bc3c35e7c47746caf91591ef748b9ce3012 (diff) | |
| download | CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.zip CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.tar.gz CMake-b34b4c5eac27bfc4a1e46f2b46ba17f5be6a8565.tar.bz2 | |
Merge topic 'vs-vctargetspath'
e7d57bc3c3 VS: Propagate CMAKE_VS_GLOBALS into custom targets
45b4b4b930 VS: Propagate CMAKE_VS_GLOBALS into compiler id projects
548e9051a4 VS: Add support to override VCTargetsPath through toolset
99e83d4235 cmake: Teach --build mode to load CMAKE_GENERATOR_TOOLSET
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3817
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index ca24a0f..dac86a1 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -543,6 +543,11 @@ void cmVisualStudio10TargetGenerator::Generate() e1.Element("VCProjectUpgraderObjectName", "NoUpgrade"); } + if (const char* vcTargetsPath = + this->GlobalGenerator->GetCustomVCTargetsPath()) { + e1.Element("VCTargetsPath", vcTargetsPath); + } + std::vector<std::string> keys = this->GeneratorTarget->GetPropertyKeys(); for (std::string const& keyIt : keys) { static const char* prefix = "VS_GLOBAL_"; |