Skip to content

Commit

Permalink
vs2013 msbuild integration: add missing .target files, fix typo in CM…
Browse files Browse the repository at this point in the history
…akeLists

This should fix PR17568.

Patch by Josh Samuel!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192610 91177308-0d34-0410-b5e6-96231b3b80d8
  • Loading branch information
zmodem committed Oct 14, 2013
1 parent e4b44c1 commit 95bf4c4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 1 deletion.
2 changes: 1 addition & 1 deletion tools/msbuild/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if (WIN32)
configure_file(${prop_file_in} ${prop_file_v110})
set(VS_VERSION "v110_xp")
configure_file(${prop_file_in} ${prop_file_v110_xp})
set(VS_VSERSION "v120")
set(VS_VERSION "v120")
set(MSC_VERSION "1800")
configure_file(${prop_file_in} ${prop_file_v120})
set(VS_VERSION "v120_xp")
Expand Down
3 changes: 3 additions & 0 deletions tools/msbuild/toolset-vs2013.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
</Project>
21 changes: 21 additions & 0 deletions tools/msbuild/toolset-vs2013_xp.targets
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<!-- Force TargetFrameworkVersion to v4.0 to support XP-->
<PropertyGroup>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<BeforeClCompileTargets>NoSupportCodeAnalysisXP;$(BeforeClCompileTargets)</BeforeClCompileTargets>
</PropertyGroup>

<Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />

<Target Name="NoSupportCodeAnalysisXP" Condition="'$(ErrorNoSupportCodeAnalysisXP)' != 'false'">
<VCMessage Condition="'$(DesignTimeBuild)' != 'true' and '@(ClCompile->AnyHaveMetadataValue('EnablePREfast', 'true'))'=='true'" Code="MSB8026" Type="Error"/>
</Target>

<PropertyGroup>
<PrepareForBuildDependsOn>CheckWindowsSDK71A;$(PrepareForBuildDependsOn)</PrepareForBuildDependsOn>
</PropertyGroup>

<Target Name="CheckWindowsSDK71A">
<VCMessage Code="MSB8003" Type="Warning" Arguments="WindowsSdkDir_71A" Condition="'$(WindowsSdkDir_71A)'=='' and '$(UseEnv)' != 'true'" />
</Target>
</Project>

0 comments on commit 95bf4c4

Please sign in to comment.