summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKWSys Robot <kwrobot@kitware.com>2015-10-06 14:28:20 (GMT)
committerBrad King <brad.king@kitware.com>2015-10-06 14:32:51 (GMT)
commitbca73252130b7f60fc12b7bcbbc95a3153047bd3 (patch)
tree330f399e77e26a09f56b0d988edf89efd925fb22
parentcc144ebfd8b3a7b89e07c3b22b6a9e8540e5d0e2 (diff)
downloadCMake-bca73252130b7f60fc12b7bcbbc95a3153047bd3.zip
CMake-bca73252130b7f60fc12b7bcbbc95a3153047bd3.tar.gz
CMake-bca73252130b7f60fc12b7bcbbc95a3153047bd3.tar.bz2
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
-rw-r--r--EncodingCXX.cxx1
-rw-r--r--SystemTools.hxx.in4
2 files changed, 3 insertions, 2 deletions
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);