From: Bill Wendling <isanbard@gmail.com>
Date: Mon, 25 Nov 2013 05:23:29 +0000 (+0000)
Subject: Merging r195479:
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=91e3564ee7cc478fc3006d6bae5387ba2d46f20c;p=llvm

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
---

diff --git a/tools/msbuild/CMakeLists.txt b/tools/msbuild/CMakeLists.txt
index c725ab79e25..08b8aee9788 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")