[Cmake-commits] CMake branch, next, updated. v3.0.0-4561-g4cedb1e

Brad King brad.king at kitware.com
Mon Jul 28 16:24:04 EDT 2014


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95 (commit)
       via  99e14a3865f96371284daef463df5e261b5698e3 (commit)
      from  4dbe18970588193b9b181bd6c8b5102bb2cfb1c9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95
commit 4cedb1e377afb5ee7f6cbf8f2016bb0ff6d03e95
Merge: 4dbe189 99e14a3
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Jul 28 16:24:03 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jul 28 16:24:03 2014 -0400

    Merge topic 'vs10-comment-typo' into next
    
    99e14a38 cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLM


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=99e14a3865f96371284daef463df5e261b5698e3
commit 99e14a3865f96371284daef463df5e261b5698e3
Author:     Gilles Khouzam <gillesk at microsoft.com>
AuthorDate: Mon Jul 28 14:04:45 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Jul 28 16:23:54 2014 -0400

    cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLM

diff --git a/Source/cmGlobalVisualStudio10Generator.cxx b/Source/cmGlobalVisualStudio10Generator.cxx
index c1b087a..80fd9f0 100644
--- a/Source/cmGlobalVisualStudio10Generator.cxx
+++ b/Source/cmGlobalVisualStudio10Generator.cxx
@@ -435,7 +435,7 @@ bool cmGlobalVisualStudio10Generator::Find64BitTools(cmMakefile* mf)
   // This edition does not come with 64-bit tools.  Look for them.
   //
   // TODO: Detect available tools?  x64\v100 exists but does not work?
-  // KHLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\4.0;VCTargetsPath
+  // HKLM\\SOFTWARE\\Microsoft\\MSBuild\\ToolsVersions\\4.0;VCTargetsPath
   // c:/Program Files (x86)/MSBuild/Microsoft.Cpp/v4.0/Platforms/
   //   {Itanium,Win32,x64}/PlatformToolsets/{v100,v90,Windows7.1SDK}
   std::string winSDK_7_1;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmGlobalVisualStudio10Generator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list