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 | 95bf4c48ed490682485d040d856e02c0e2f6f9af (patch) | |
| tree | 63269a7895f85c04c2bccd5e65f58f671d4a450b /tools | |
| parent | e4b44c1617b82ba4bb5451df83cfc214b1e5d5f5 (diff) | |
| download | external_llvm-95bf4c48ed490682485d040d856e02c0e2f6f9af.zip external_llvm-95bf4c48ed490682485d040d856e02c0e2f6f9af.tar.gz external_llvm-95bf4c48ed490682485d040d856e02c0e2f6f9af.tar.bz2 | |
vs2013 msbuild integration: add missing .target files, fix typo in CMakeLists
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
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/msbuild/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tools/msbuild/toolset-vs2013.targets | 3 | ||||
| -rw-r--r-- | tools/msbuild/toolset-vs2013_xp.targets | 21 |
3 files changed, 25 insertions, 1 deletions
diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt index cc4f3d5..c725ab7 100644 --- a/tools/msbuild/CMakeLists.txt +++ b/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/tools/msbuild/toolset-vs2013.targets b/tools/msbuild/toolset-vs2013.targets new file mode 100644 index 0000000..a6efac4 --- /dev/null +++ b/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/tools/msbuild/toolset-vs2013_xp.targets b/tools/msbuild/toolset-vs2013_xp.targets new file mode 100644 index 0000000..e719681 --- /dev/null +++ b/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> |