From a22ff961db47ffff4f1e795d810aa102edb9b79b Mon Sep 17 00:00:00 2001 From: Reid Kleckner Date: Thu, 19 Sep 2013 16:50:40 +0000 Subject: Include an LLVM-vs2012_xp toolset in the MSBuild integration Patch by Paul Hampson! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191010 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/msbuild/CMakeLists.txt | 4 ++++ .../Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets | 21 +++++++++++++++++++++ tools/msbuild/install.bat | 6 ++++++ tools/msbuild/uninstall.bat | 6 ++++++ 4 files changed, 37 insertions(+) create mode 100644 tools/msbuild/Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets (limited to 'tools/msbuild') diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt index 860ed22526..8de3b88154 100644 --- a/tools/msbuild/CMakeLists.txt +++ b/tools/msbuild/CMakeLists.txt @@ -2,6 +2,7 @@ if (WIN32) set(prop_file_in "Microsoft.Cpp.Win32.llvm.props.in") set(prop_file_v100 "Microsoft.Cpp.Win32.LLVM-vs2010.props") set(prop_file_v110 "Microsoft.Cpp.Win32.LLVM-vs2012.props") + set(prop_file_v110_xp "Microsoft.Cpp.Win32.LLVM-vs2012_xp.props") # CPack will install a registry key in this format that we wish to reference. set(REG_KEY "${CMAKE_PROJECT_NAME} ${CPACK_PACKAGE_VERSION}") @@ -10,11 +11,14 @@ if (WIN32) configure_file(${prop_file_in} ${prop_file_v100}) set(VS_VERSION "v110") configure_file(${prop_file_in} ${prop_file_v110}) + set(VS_VERSION "v110_xp") + configure_file(${prop_file_in} ${prop_file_v110_xp}) set(REG_KEY) set(VS_VERSION) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${prop_file_v100}" DESTINATION tools/msbuild) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${prop_file_v110}" DESTINATION tools/msbuild) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${prop_file_v110_xp}" DESTINATION tools/msbuild) install(DIRECTORY . DESTINATION tools/msbuild diff --git a/tools/msbuild/Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets b/tools/msbuild/Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets new file mode 100644 index 0000000000..e8250d8e82 --- /dev/null +++ b/tools/msbuild/Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets @@ -0,0 +1,21 @@ + + + + v4.0 + NoSupportCodeAnalysisXP;$(BeforeClCompileTargets) + + + + + + + + + + CheckWindowsSDK71A;$(PrepareForBuildDependsOn) + + + + + + diff --git a/tools/msbuild/install.bat b/tools/msbuild/install.bat index 2d5af629af..2b66a6c01a 100644 --- a/tools/msbuild/install.bat +++ b/tools/msbuild/install.bat @@ -39,6 +39,12 @@ copy Microsoft.Cpp.Win32.LLVM-vs2012.props %D%\LLVM-vs2012 IF NOT %ERRORLEVEL% == 0 GOTO FAILED copy Microsoft.Cpp.Win32.LLVM-vs2012.targets %D%\LLVM-vs2012 IF NOT %ERRORLEVEL% == 0 GOTO FAILED +IF NOT EXIST %D%\LLVM-vs2012_xp mkdir %D%\LLVM-vs2012_xp +IF NOT %ERRORLEVEL% == 0 GOTO FAILED +copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.props %D%\LLVM-vs2012_xp +IF NOT %ERRORLEVEL% == 0 GOTO FAILED +copy Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets %D%\LLVM-vs2012_xp +IF NOT %ERRORLEVEL% == 0 GOTO FAILED echo Done! goto END diff --git a/tools/msbuild/uninstall.bat b/tools/msbuild/uninstall.bat index c6972397e7..f1f5619a77 100644 --- a/tools/msbuild/uninstall.bat +++ b/tools/msbuild/uninstall.bat @@ -19,10 +19,16 @@ SET D="%ProgramFiles%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformTo IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.props IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.targets IF EXIST %D%\LLVM-vs2012 rmdir %D%\LLVM-vs2012 +IF EXIST %D%\LLVM-vs2012_xp del %D%\LLVM-vs2012_xp\Microsoft.Cpp.Win32.LLVM-vs2012_xp.props +IF EXIST %D%\LLVM-vs2012_xp del %D%\LLVM-vs2012_xp\Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets +IF EXIST %D%\LLVM-vs2012_xp rmdir %D%\LLVM-vs2012_xp SET D="%ProgramFiles(x86)%\MSBuild\Microsoft.Cpp\v4.0\V110\Platforms\Win32\PlatformToolsets" IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.props IF EXIST %D%\LLVM-vs2012 del %D%\LLVM-vs2012\Microsoft.Cpp.Win32.LLVM-vs2012.targets IF EXIST %D%\LLVM-vs2012 rmdir %D%\LLVM-vs2012 +IF EXIST %D%\LLVM-vs2012_xp del %D%\LLVM-vs2012_xp\Microsoft.Cpp.Win32.LLVM-vs2012_xp.props +IF EXIST %D%\LLVM-vs2012_xp del %D%\LLVM-vs2012_xp\Microsoft.Cpp.Win32.LLVM-vs2012_xp.targets +IF EXIST %D%\LLVM-vs2012_xp rmdir %D%\LLVM-vs2012_xp echo Done! -- cgit v1.2.3