diff options
author | Hans Wennborg <hans@hanshq.net> | 2013-10-14 18:16:37 +0000 |
---|---|---|
committer | Hans Wennborg <hans@hanshq.net> | 2013-10-14 18:16:37 +0000 |
commit | 1f39e343ef84f6c506a5053d06394266661280bd (patch) | |
tree | ae039daeaf7c858083b6e193ef60b58e3a8291fd /llvm/tools/msbuild | |
parent | 58af7e177c16f5bcaec745f76693e112275635f5 (diff) | |
download | llvm-1f39e343ef84f6c506a5053d06394266661280bd.zip llvm-1f39e343ef84f6c506a5053d06394266661280bd.tar.gz llvm-1f39e343ef84f6c506a5053d06394266661280bd.tar.bz2 |
vs2013 msbuild integration: add missing .target files, fix typo in CMakeLists
This should fix PR17568.
Patch by Josh Samuel!
llvm-svn: 192610
Diffstat (limited to 'llvm/tools/msbuild')
-rw-r--r-- | llvm/tools/msbuild/CMakeLists.txt | 2 | ||||
-rw-r--r-- | llvm/tools/msbuild/toolset-vs2013.targets | 3 | ||||
-rw-r--r-- | llvm/tools/msbuild/toolset-vs2013_xp.targets | 21 |
3 files changed, 25 insertions, 1 deletions
diff --git a/llvm/tools/msbuild/CMakeLists.txt b/llvm/tools/msbuild/CMakeLists.txt index cc4f3d5..c725ab7 100644 --- a/llvm/tools/msbuild/CMakeLists.txt +++ b/llvm/tools/msbuild/CMakeLists.txt @@ -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") diff --git a/llvm/tools/msbuild/toolset-vs2013.targets b/llvm/tools/msbuild/toolset-vs2013.targets new file mode 100644 index 0000000..a6efac4 --- /dev/null +++ b/llvm/tools/msbuild/toolset-vs2013.targets @@ -0,0 +1,3 @@ +<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <Import Project="$(VCTargetsPath)\Microsoft.CppCommon.targets" />
+</Project>
diff --git a/llvm/tools/msbuild/toolset-vs2013_xp.targets b/llvm/tools/msbuild/toolset-vs2013_xp.targets new file mode 100644 index 0000000..e719681 --- /dev/null +++ b/llvm/tools/msbuild/toolset-vs2013_xp.targets @@ -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> |