summaryrefslogtreecommitdiff
path: root/tools/msbuild
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2014-02-13 22:01:35 +0000
committerHans Wennborg <hans@hanshq.net>2014-02-13 22:01:35 +0000
commitc5887a23850e83993673b2a0b20b1eaa89687e96 (patch)
tree8b97be180a99d7049039343e8b0052ca205da2fd /tools/msbuild
parentd60c43b4f312016d4c952e2dab5c8d14ad4856fd (diff)
MSBuild integration: get the LibraryPath right (PR18707)
It was pointing to lib\clang\3.4, but now we're on 3.5. Make CMake insert the right version automatically. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201363 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/msbuild')
-rw-r--r--tools/msbuild/CMakeLists.txt2
-rw-r--r--tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in2
2 files changed, 3 insertions, 1 deletions
diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt
index f8c25126769..b7be71d2a88 100644
--- a/tools/msbuild/CMakeLists.txt
+++ b/tools/msbuild/CMakeLists.txt
@@ -1,6 +1,7 @@
if (WIN32)
# CPack will install a registry key in this format that we wish to reference.
set(REG_KEY "${CPACK_PACKAGE_INSTALL_REGISTRY_KEY}")
+ set(LIB_PATH_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
foreach (platform "Win32" "x64")
set(prop_file_in "Microsoft.Cpp.Win32.llvm.props.in")
@@ -45,6 +46,7 @@ if (WIN32)
install(FILES "toolset-vs2013_xp.targets" DESTINATION "tools/msbuild/${platform}")
endforeach()
+ set(LIB_PATH_VERSION)
set(REG_KEY)
install(DIRECTORY .
diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
index 78cd8e23434..a775c31c767 100644
--- a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
+++ b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
@@ -6,7 +6,7 @@
<LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\@REG_KEY@)</LLVMInstallDir>
<LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\@REG_KEY@)</LLVMInstallDir>
<ExecutablePath>$(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
- <LibraryPath>$(LLVMInstallDir)\lib\clang\3.4\lib\windows;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(LLVMInstallDir)\lib\clang\@LIB_PATH_VERSION@\lib\windows;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>