[llvm] r201363 - MSBuild integration: get the LibraryPath right (PR18707)

[Hans Wennborg]

Author: hans
Date: Thu Feb 13 16:01:35 2014
New Revision: 201363

URL: http://llvm.org/viewvc/llvm-project?rev=201363&view=rev
Log:
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.

Modified:
    llvm/trunk/tools/msbuild/CMakeLists.txt
    llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in

Modified: llvm/trunk/tools/msbuild/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/CMakeLists.txt?rev=201363&r1=201362&r2=201363&view=diff
==============================================================================
--- llvm/trunk/tools/msbuild/CMakeLists.txt (original)
+++ llvm/trunk/tools/msbuild/CMakeLists.txt Thu Feb 13 16:01:35 2014
@@ -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 .

Modified: llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in?rev=201363&r1=201362&r2=201363&view=diff
==============================================================================
--- llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in (original)
+++ llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in Thu Feb 13 16:01:35 2014
@@ -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>