[Cmake-commits] CMake branch, next, updated. v3.3.2-1485-gf0dba83

[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  f0dba830863feecb9b147632ae5b49c209249dc1 (commit)
       via  d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (commit)
       via  bca73252130b7f60fc12b7bcbbc95a3153047bd3 (commit)
      from  fc4520b4b8a2656ba636fc58a4923e1b9c475c6e (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=f0dba830863feecb9b147632ae5b49c209249dc1
commit f0dba830863feecb9b147632ae5b49c209249dc1
Merge: fc4520b d0c3bf6
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:47:33 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 6 10:47:33 2015 -0400

    Merge topic 'update-kwsys' into next
    
    d0c3bf65 Merge branch 'upstream-kwsys' into update-kwsys
    bca73252 KWSys 2015-10-06 (d79801bb)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c3bf65d560659303e6d3e96da4e6c2c749d3b8
commit d0c3bf65d560659303e6d3e96da4e6c2c749d3b8
Merge: f2791da bca7325
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 6 10:32:55 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:32:55 2015 -0400

    Merge branch 'upstream-kwsys' into update-kwsys


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bca73252130b7f60fc12b7bcbbc95a3153047bd3
commit bca73252130b7f60fc12b7bcbbc95a3153047bd3
Author:     KWSys Robot <kwrobot at kitware.com>
AuthorDate: Tue Oct 6 10:28:20 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Oct 6 10:32:51 2015 -0400

    KWSys 2015-10-06 (d79801bb)
    
    Extract upstream KWSys using the following shell commands.
    
    $ git archive --prefix=upstream-kwsys/ d79801bb | tar x
    $ git shortlog --no-merges --abbrev=8 --format='%h %s' 2089567a..d79801bb
    Brad King (1):
          e56e3292 Encoding: Support building on Windows with WIN32_LEAN_AND_MEAN
    
    Terrell Russell (1):
          d79801bb SystemTools: Fix spelling of "succeeded" in comments

diff --git a/EncodingCXX.cxx b/EncodingCXX.cxx
index 7d9b3e4..597d4bd 100644
--- a/EncodingCXX.cxx
+++ b/EncodingCXX.cxx
@@ -38,6 +38,7 @@
 // Windows API.
 #if defined(_WIN32)
 # include <windows.h>
+# include <shellapi.h>
 #endif
 
 namespace KWSYS_NAMESPACE
diff --git a/SystemTools.hxx.in b/SystemTools.hxx.in
index d2d1d40..bba5a5c 100644
--- a/SystemTools.hxx.in
+++ b/SystemTools.hxx.in
@@ -703,13 +703,13 @@ public:
 
   /**
    * Create a symbolic link if the platform supports it.  Returns whether
-   * creation succeded.
+   * creation succeeded.
    */
   static bool CreateSymlink(const std::string& origName, const std::string& newName);
 
   /**
    * Read the contents of a symbolic link.  Returns whether reading
-   * succeded.
+   * succeeded.
    */
   static bool ReadSymlink(const std::string& newName, std::string& origName);
 

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

Summary of changes:
 Source/kwsys/EncodingCXX.cxx    |    1 +
 Source/kwsys/SystemTools.hxx.in |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake