[Cmake-commits] CMake branch, next, updated. v2.8.7-2388-g49400d3
Brad King
brad.king at kitware.com
Wed Feb 1 09:04:20 EST 2012
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 49400d33dde2512de8c6249fa79f15dfcbd93747 (commit)
via 336003a563c91bf47416c79c09c84d76a8b703ff (commit)
from a6f603dd9d3ea52c43605bd00fc586078c9d46b8 (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=49400d33dde2512de8c6249fa79f15dfcbd93747
commit 49400d33dde2512de8c6249fa79f15dfcbd93747
Merge: a6f603d 336003a
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 09:04:14 2012 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Feb 1 09:04:14 2012 -0500
Merge topic 'find-vcexpress' into next
336003a Fix line-too-long style violation from parent
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=336003a563c91bf47416c79c09c84d76a8b703ff
commit 336003a563c91bf47416c79c09c84d76a8b703ff
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 1 09:01:42 2012 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 1 09:01:42 2012 -0500
Fix line-too-long style violation from parent
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index 6957925..c0c73d6 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -2204,7 +2204,8 @@ int cmake::ActualConfigure()
std::string installedCompiler;
// Try to find the newest VS installed on the computer and
// use that as a default if -G is not specified
- const std::string vsregBase = "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\";
+ const std::string vsregBase =
+ "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\";
std::vector<std::string> vsVerions;
vsVerions.push_back("VisualStudio\\");
vsVerions.push_back("VCExpress\\");
@@ -2221,13 +2222,14 @@ int cmake::ActualConfigure()
{"9.0", "Visual Studio 9 2008"},
{"10.0", "Visual Studio 10"},
{0, 0}};
- for (size_t b = 0; b < vsVerions.size() && installedCompiler.empty(); b++)
+ for(size_t b=0; b < vsVerions.size() && installedCompiler.empty(); b++)
{
for(int i =0; version[i].MSVersion != 0; i++)
{
std::string reg = vsregBase + vsVerions[b] + version[i].MSVersion;
reg += ";InstallDir]";
- cmSystemTools::ExpandRegistryValues(reg, cmSystemTools::KeyWOW64_32);
+ cmSystemTools::ExpandRegistryValues(reg,
+ cmSystemTools::KeyWOW64_32);
if (!(reg == "/registry"))
{
installedCompiler = version[i].GeneratorName;
-----------------------------------------------------------------------
Summary of changes:
Source/cmake.cxx | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list