[llvm-branch-commits] [llvm-branch] r195607 - Merging r195479:

[Bill Wendling]

Author: void
Date: Sun Nov 24 23:23:29 2013
New Revision: 195607

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

Modified:
    llvm/branches/release_34/   (props changed)
    llvm/branches/release_34/tools/msbuild/CMakeLists.txt

Propchange: llvm/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Nov 24 23:23:29 2013
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195333,195339,195355,195397-195399,195421,195423,195432,195439,195476-195477,195491-195493,195567,195599
+/llvm/trunk:155241,195092-195094,195100,195102-195103,195118,195129,195138,195152,195156-195157,195161-195162,195193,195272,195317-195318,195333,195339,195355,195397-195399,195421,195423,195432,195439,195476-195477,195479,195491-195493,195567,195599

Modified: llvm/branches/release_34/tools/msbuild/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_34/tools/msbuild/CMakeLists.txt?rev=195607&r1=195606&r2=195607&view=diff
==============================================================================
--- llvm/branches/release_34/tools/msbuild/CMakeLists.txt (original)
+++ llvm/branches/release_34/tools/msbuild/CMakeLists.txt Sun Nov 24 23:23:29 2013
@@ -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")