llvm.org GIT mirror llvm / c5887a2
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 Hans Wennborg 6 years ago
2 changed file(s) with 3 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
0 if (WIN32)
11 # CPack will install a registry key in this format that we wish to reference.
22 set(REG_KEY "${CPACK_PACKAGE_INSTALL_REGISTRY_KEY}")
3 set(LIB_PATH_VERSION "${LLVM_VERSION_MAJOR}.${LLVM_VERSION_MINOR}")
34
45 foreach (platform "Win32" "x64")
56 set(prop_file_in "Microsoft.Cpp.Win32.llvm.props.in")
4445 install(FILES "toolset-vs2013_xp.targets" DESTINATION "tools/msbuild/${platform}")
4546 endforeach()
4647
48 set(LIB_PATH_VERSION)
4749 set(REG_KEY)
4850
4951 install(DIRECTORY .
55 $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\@REG_KEY@)
66 $(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\@REG_KEY@)
77 $(LLVMInstallDir)\msbuild-bin;$(ExecutablePath)
8 $(LLVMInstallDir)\lib\clang\3.4\lib\windows;$(LibraryPath)
8 $(LLVMInstallDir)\lib\clang\@LIB_PATH_VERSION@\lib\windows;$(LibraryPath)
99
1010
1111