diff options
| author | Brad King <brad.king@kitware.com> | 2018-12-13 15:03:46 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-12-13 15:03:52 (GMT) |
| commit | e2d0da3366ca09f98be4f5557397838f4a59f49f (patch) | |
| tree | 72b185b5e8abbf27217f0d5ed0b74565441b1a9a /Source/cmVisualStudio10TargetGenerator.cxx | |
| parent | ed1c375c05e09997c9ffafc739fb6d3c1dca5c27 (diff) | |
| parent | b5b63da0883bdd3487e7a3b423acbdd5b582326a (diff) | |
| download | CMake-e2d0da3366ca09f98be4f5557397838f4a59f49f.zip CMake-e2d0da3366ca09f98be4f5557397838f4a59f49f.tar.gz CMake-e2d0da3366ca09f98be4f5557397838f4a59f49f.tar.bz2 | |
Merge topic 'vs_deploy_content_fix'
b5b63da088 VS: Fix Deploy content in .csproj files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2713
Diffstat (limited to 'Source/cmVisualStudio10TargetGenerator.cxx')
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 667e40b..6d54c12 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1681,6 +1681,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1, subType = "Designer"; } if (const char* c = sf->GetProperty("VS_COPY_TO_OUT_DIR")) { + tool = "Content"; copyToOutDir = c; toolHasSettings = true; } |