diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-29 13:17:09 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-29 13:17:14 (GMT) |
| commit | de76de9606e35bd156819621df09f2fe914fc34d (patch) | |
| tree | f117d0f6121c8bfd0037438ed3c9d833e0437d94 /Source | |
| parent | 3974d850a6fbc5f5cfce356fc19b2c00afcb815a (diff) | |
| parent | 3db61cf9851ae7df1685ec2c8525f5d45bc52d82 (diff) | |
| download | CMake-de76de9606e35bd156819621df09f2fe914fc34d.zip CMake-de76de9606e35bd156819621df09f2fe914fc34d.tar.gz CMake-de76de9606e35bd156819621df09f2fe914fc34d.tar.bz2 | |
Merge topic 'vs-VCTargetsPath-Platform'
3db61cf985 VS: Fix VCTargetsPath detection when cross-compiling
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6053
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmGlobalVisualStudio10Generator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx index 93fbe37..6c52ce0 100644 --- a/Source/cmGlobalVisualStudio10Generator.cxx +++ b/Source/cmGlobalVisualStudio10Generator.cxx @@ -1036,6 +1036,7 @@ bool cmGlobalVisualStudio10Generator::FindVCTargetsPath(cmMakefile* mf) cmd.push_back(this->GetMSBuildCommand()); cmd.push_back(vcxproj); cmd.push_back("/p:Configuration=Debug"); + cmd.push_back(cmStrCat("/p:Platform=", this->GetPlatformName())); cmd.push_back(std::string("/p:VisualStudioVersion=") + this->GetIDEVersion()); std::string out; |