diff options
| author | Brad King <brad.king@kitware.com> | 2016-06-23 12:59:29 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-06-23 12:59:29 (GMT) |
| commit | c2c2a2f4c7e23192d3d8cd8d53a427d651ef3137 (patch) | |
| tree | f8c113b0190804e275927e3115a789ec1f021092 /Source | |
| parent | 015876fa810f45c560c1feb7f0b8092301304db8 (diff) | |
| parent | ed05f11dd27d668791887f32e2c7be00753cfdb5 (diff) | |
| download | CMake-c2c2a2f4c7e23192d3d8cd8d53a427d651ef3137.zip CMake-c2c2a2f4c7e23192d3d8cd8d53a427d651ef3137.tar.gz CMake-c2c2a2f4c7e23192d3d8cd8d53a427d651ef3137.tar.bz2 | |
Merge topic 'vs-tool-override'
ed05f11d VS: Add a VS_TOOL_OVERRIDE source file property
Diffstat (limited to 'Source')
| -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 6ab32bf..635fad2 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1203,6 +1203,11 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf) } } + const char* toolOverride = sf->GetProperty("VS_TOOL_OVERRIDE"); + if (toolOverride && *toolOverride) { + tool = toolOverride; + } + std::string deployContent; std::string deployLocation; if (this->GlobalGenerator->TargetsWindowsPhone() || |