diff options
| author | Reid Kleckner <reid@kleckner.net> | 2013-09-19 17:18:35 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2013-09-19 17:18:35 +0000 |
| commit | 31eb340cb68172874f5ad6d1fd7b3cb286a8615c (patch) | |
| tree | 58b72709b414495390ae4c164cc729896ee4b9af | |
| parent | 4f77a21d6ca2d560a7508fd54581b12dfc01630b (diff) | |
| download | external_llvm-31eb340cb68172874f5ad6d1fd7b3cb286a8615c.zip external_llvm-31eb340cb68172874f5ad6d1fd7b3cb286a8615c.tar.gz external_llvm-31eb340cb68172874f5ad6d1fd7b3cb286a8615c.tar.bz2 | |
msbuild: Set _MSC_VER to match the CRT we're using
Various Windows SDK headers use _MSC_VER values to figure out what
version of the VC++ headers they're using, in particular for SAL macros.
Patch by Paul Hampson!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@191015 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | tools/msbuild/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in | 7 |
2 files changed, 10 insertions, 0 deletions
diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt index 8de3b88..894645a 100644 --- a/tools/msbuild/CMakeLists.txt +++ b/tools/msbuild/CMakeLists.txt @@ -8,14 +8,17 @@ if (WIN32) set(REG_KEY "${CMAKE_PROJECT_NAME} ${CPACK_PACKAGE_VERSION}") set(VS_VERSION "v100") + set(MSC_VERSION "1600") configure_file(${prop_file_in} ${prop_file_v100}) set(VS_VERSION "v110") + set(MSC_VERSION "1700") 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) + set(MSC_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) diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in index 07e931f..fce6011 100644 --- a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in +++ b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in @@ -7,4 +7,11 @@ <ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
<LibraryPath>$(LLVMInstallDir)\lib\clang\3.4\lib\windows;$(LibraryPath)</LibraryPath>
</PropertyGroup>
+
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <!-- Set the value of _MSC_VER to claim for compatibility -->
+ <AdditionalOptions>-fmsc-version=@MSC_VERSION@ %(AdditionalOptions)</AdditionalOptions>
+ </ClCompile>
+ </ItemDefinitionGroup>
</Project>
|