[llvm] r195479 - VS integration: use the correct registry key after r195379

Hans Wennborg hans at hanshq.net
Fri Nov 22 10:25:43 PST 2013


Author: hans
Date: Fri Nov 22 12:25:43 2013
New Revision: 195479

URL: http://llvm.org/viewvc/llvm-project?rev=195479&view=rev
Log:
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/trunk/tools/msbuild/CMakeLists.txt

Modified: llvm/trunk/tools/msbuild/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/CMakeLists.txt?rev=195479&r1=195478&r2=195479&view=diff
==============================================================================
--- llvm/trunk/tools/msbuild/CMakeLists.txt (original)
+++ llvm/trunk/tools/msbuild/CMakeLists.txt Fri Nov 22 12:25:43 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")





More information about the llvm-commits mailing list