diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-06 14:32:55 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-10-06 14:32:55 (GMT) |
| commit | d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (patch) | |
| tree | c65691caa5fffe8c6f8ad108649585cd730ffeda | |
| parent | f2791da132a42cb71384065b340ae212679fc336 (diff) | |
| parent | bca73252130b7f60fc12b7bcbbc95a3153047bd3 (diff) | |
| download | CMake-d0c3bf65d560659303e6d3e96da4e6c2c749d3b8.zip CMake-d0c3bf65d560659303e6d3e96da4e6c2c749d3b8.tar.gz CMake-d0c3bf65d560659303e6d3e96da4e6c2c749d3b8.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
| -rw-r--r-- | Source/kwsys/EncodingCXX.cxx | 1 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.hxx.in | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/Source/kwsys/EncodingCXX.cxx b/Source/kwsys/EncodingCXX.cxx index 7d9b3e4..597d4bd 100644 --- a/Source/kwsys/EncodingCXX.cxx +++ b/Source/kwsys/EncodingCXX.cxx @@ -38,6 +38,7 @@ // Windows API. #if defined(_WIN32) # include <windows.h> +# include <shellapi.h> #endif namespace KWSYS_NAMESPACE diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in index d2d1d40..bba5a5c 100644 --- a/Source/kwsys/SystemTools.hxx.in +++ b/Source/kwsys/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); |