aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorBill Wendling <isanbard@gmail.com>2013-11-25 05:23:29 +0000
committerBill Wendling <isanbard@gmail.com>2013-11-25 05:23:29 +0000
commit91e3564ee7cc478fc3006d6bae5387ba2d46f20c (patch)
treef68dc1a803ed50f0b599c586a25de2bc9bb0ba24 /tools
parente96466ecc0b2bdee0bed2156e12dc16f4adb2d50 (diff)
downloadexternal_llvm-91e3564ee7cc478fc3006d6bae5387ba2d46f20c.zip
external_llvm-91e3564ee7cc478fc3006d6bae5387ba2d46f20c.tar.gz
external_llvm-91e3564ee7cc478fc3006d6bae5387ba2d46f20c.tar.bz2
Merging r195479:
------------------------------------------------------------------------ r195479 | hans | 2013-11-22 10:25:43 -0800 (Fri, 22 Nov 2013) | 4 lines VS integration: use the correct registry key after r195379 I changed the registry key in that commit, but forgot to update the integration files. This change makes them use the same variable. ------------------------------------------------------------------------ git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_34@195607 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r--tools/msbuild/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt
index c725ab7..08b8aee 100644
--- a/tools/msbuild/CMakeLists.txt
+++ b/tools/msbuild/CMakeLists.txt
@@ -7,7 +7,7 @@ if (WIN32)
set(prop_file_v120_xp "toolset-vs2013_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}")
+ set(REG_KEY "${CPACK_PACKAGE_INSTALL_REGISTRY_KEY}")
set(VS_VERSION "v100")
set(MSC_VERSION "1600")