[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-597-gef81b2c

[Brad King]

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  ef81b2c85442d16d9e5505448d600593071e21c1 (commit)
       via  5cc8bff572de2d534d89c0b8cc3ce2dc75487b72 (commit)
      from  c9b12dc066106bf77318736716463247980ab013 (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=ef81b2c85442d16d9e5505448d600593071e21c1
commit ef81b2c85442d16d9e5505448d600593071e21c1
Merge: c9b12dc 5cc8bff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 14 09:12:56 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Nov 14 09:12:56 2014 -0500

    Merge topic 'vs-check-phone-store-tools' into next
    
    5cc8bff5 VS: Shorten long lines


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5cc8bff572de2d534d89c0b8cc3ce2dc75487b72
commit 5cc8bff572de2d534d89c0b8cc3ce2dc75487b72
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Nov 14 09:11:20 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Nov 14 09:11:20 2014 -0500

    VS: Shorten long lines

diff --git a/Source/cmGlobalVisualStudio11Generator.cxx b/Source/cmGlobalVisualStudio11Generator.cxx
index ff94301..2b69222 100644
--- a/Source/cmGlobalVisualStudio11Generator.cxx
+++ b/Source/cmGlobalVisualStudio11Generator.cxx
@@ -192,7 +192,8 @@ cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset(
       return false;
       }
     }
-  return this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset(toolset);
+  return
+    this->cmGlobalVisualStudio10Generator::SelectWindowsPhoneToolset(toolset);
 }
 
 //----------------------------------------------------------------------------
@@ -213,7 +214,8 @@ cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset(
       return false;
       }
     }
-  return this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset(toolset);
+  return
+    this->cmGlobalVisualStudio10Generator::SelectWindowsStoreToolset(toolset);
 }
 
 //----------------------------------------------------------------------------
@@ -299,12 +301,12 @@ cmGlobalVisualStudio11Generator::NeedsDeploy(cmTarget::TargetType type) const
 bool
 cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const
 {
-  const char desktop80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                              "VisualStudio\\11.0\\VC\\Libraries\\Extended";
-
-  const char VS2012DesktopExpressKey[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\"
-                                         "Microsoft\\WDExpress\\11.0;"
-                                         "InstallDir";
+  const char desktop80Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\11.0\\VC\\Libraries\\Extended";
+  const char VS2012DesktopExpressKey[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "WDExpress\\11.0;InstallDir";
 
   std::vector<std::string> subkeys;
   std::string path;
@@ -320,9 +322,10 @@ cmGlobalVisualStudio11Generator::IsWindowsDesktopToolsetInstalled() const
 bool
 cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const
 {
-  const char wp80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                         "Microsoft SDKs\\WindowsPhone\\v8.0\\"
-                         "Install Path;Install Path";
+  const char wp80Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "Microsoft SDKs\\WindowsPhone\\v8.0\\"
+    "Install Path;Install Path";
 
   std::string path;
   cmSystemTools::ReadRegistryValue(wp80Key,
@@ -335,8 +338,9 @@ cmGlobalVisualStudio11Generator::IsWindowsPhoneToolsetInstalled() const
 bool
 cmGlobalVisualStudio11Generator::IsWindowsStoreToolsetInstalled() const
 {
-  const char win80Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                          "VisualStudio\\11.0\\VC\\Libraries\\Core\\Arm";
+  const char win80Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\11.0\\VC\\Libraries\\Core\\Arm";
 
   std::vector<std::string> subkeys;
   return cmSystemTools::GetRegistrySubKeys(win80Key,
diff --git a/Source/cmGlobalVisualStudio12Generator.cxx b/Source/cmGlobalVisualStudio12Generator.cxx
index 640010f..047f2ad 100644
--- a/Source/cmGlobalVisualStudio12Generator.cxx
+++ b/Source/cmGlobalVisualStudio12Generator.cxx
@@ -172,7 +172,8 @@ cmGlobalVisualStudio12Generator::SelectWindowsPhoneToolset(
       return false;
       }
     }
-  return this->cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset(toolset);
+  return
+    this->cmGlobalVisualStudio11Generator::SelectWindowsPhoneToolset(toolset);
 }
 
 //----------------------------------------------------------------------------
@@ -193,7 +194,8 @@ cmGlobalVisualStudio12Generator::SelectWindowsStoreToolset(
       return false;
       }
     }
-  return this->cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset(toolset);
+  return
+    this->cmGlobalVisualStudio11Generator::SelectWindowsStoreToolset(toolset);
 }
 
 //----------------------------------------------------------------------------
@@ -223,8 +225,9 @@ cmLocalGenerator *cmGlobalVisualStudio12Generator::CreateLocalGenerator()
 bool
 cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const
 {
-  const char desktop81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                              "VisualStudio\\12.0\\VC\\LibraryDesktop";
+  const char desktop81Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\12.0\\VC\\LibraryDesktop";
 
   std::vector<std::string> subkeys;
   return cmSystemTools::GetRegistrySubKeys(desktop81Key,
@@ -236,8 +239,9 @@ cmGlobalVisualStudio12Generator::IsWindowsDesktopToolsetInstalled() const
 bool
 cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const
 {
-  const char wp81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                         "Microsoft SDKs\\WindowsPhone\\v8.1\\Install Path;Install Path";
+  const char wp81Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "Microsoft SDKs\\WindowsPhone\\v8.1\\Install Path;Install Path";
 
   std::string path;
   cmSystemTools::ReadRegistryValue(wp81Key,
@@ -250,8 +254,9 @@ cmGlobalVisualStudio12Generator::IsWindowsPhoneToolsetInstalled() const
 bool
 cmGlobalVisualStudio12Generator::IsWindowsStoreToolsetInstalled() const
 {
-  const char win81Key[] = "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
-                          "VisualStudio\\12.0\\VC\\Libraries\\Core\\Arm";
+  const char win81Key[] =
+    "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\"
+    "VisualStudio\\12.0\\VC\\Libraries\\Core\\Arm";
 
   std::vector<std::string> subkeys;
   return cmSystemTools::GetRegistrySubKeys(win81Key,

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

Summary of changes:
 Source/cmGlobalVisualStudio11Generator.cxx |   30 ++++++++++++++++------------
 Source/cmGlobalVisualStudio12Generator.cxx |   21 +++++++++++--------
 2 files changed, 30 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
CMake