[Cmake-commits] CMake branch, next, updated. v3.8.0-rc1-258-g76839b6

Brad King brad.king at kitware.com
Mon Feb 20 10:34:27 EST 2017


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  76839b6a522342fd85190cce6bf052140ea2d5af (commit)
       via  4984d86008d6d40a96d6bc2b7a27f53627427bac (commit)
      from  503369e7ca9efff903df4c551b60cb6ba424d2c1 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=76839b6a522342fd85190cce6bf052140ea2d5af
commit 76839b6a522342fd85190cce6bf052140ea2d5af
Merge: 503369e 4984d86
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 10:34:27 2017 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 20 10:34:27 2017 -0500

    Merge topic 'vs2017-fallback-sdk' into next
    
    4984d860 fixup! VS2017: If Win 8.1 SDK is not available, use Win 10 SDK


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4984d86008d6d40a96d6bc2b7a27f53627427bac
commit 4984d86008d6d40a96d6bc2b7a27f53627427bac
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 20 10:34:14 2017 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 20 10:34:14 2017 -0500

    fixup! VS2017: If Win 8.1 SDK is not available, use Win 10 SDK

diff --git a/Source/cmGlobalVisualStudio15Generator.cxx b/Source/cmGlobalVisualStudio15Generator.cxx
index 4ded7a1..ac67051 100644
--- a/Source/cmGlobalVisualStudio15Generator.cxx
+++ b/Source/cmGlobalVisualStudio15Generator.cxx
@@ -109,7 +109,7 @@ void cmGlobalVisualStudio15Generator::WriteSLNHeader(std::ostream& fout)
   }
 }
 
-bool cmGlobalVisualStudio15Generator::InitializeWindows(cmMakefile *mf)
+bool cmGlobalVisualStudio15Generator::InitializeWindows(cmMakefile* mf)
 {
   // If the Win 8.1 SDK is installed then we can select a SDK matching
   // the target Windows version.
diff --git a/Source/cmGlobalVisualStudio15Generator.h b/Source/cmGlobalVisualStudio15Generator.h
index ecf224d..7240e1a 100644
--- a/Source/cmGlobalVisualStudio15Generator.h
+++ b/Source/cmGlobalVisualStudio15Generator.h
@@ -28,7 +28,7 @@ public:
 
   virtual const char* GetToolsVersion() { return "15.0"; }
 protected:
-  bool InitializeWindows(cmMakefile *mf) CM_OVERRIDE;
+  bool InitializeWindows(cmMakefile* mf) CM_OVERRIDE;
   virtual bool SelectWindowsStoreToolset(std::string& toolset) const;
 
   virtual const char* GetIDEVersion() { return "15.0"; }

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

Summary of changes:
 Source/cmGlobalVisualStudio15Generator.cxx |    2 +-
 Source/cmGlobalVisualStudio15Generator.h   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list