diff options
| author | Brad King <brad.king@kitware.com> | 2015-10-08 14:31:46 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-10-08 14:31:46 (GMT) |
| commit | 3cf71728a17899673f7a07dea9d0242e7d7bff1f (patch) | |
| tree | 69efd7809e5d95e80f7431459df8abebf82eb5af | |
| parent | fc7a191c53da12c4293e82f2dbfc07a08440369c (diff) | |
| parent | d0c3bf65d560659303e6d3e96da4e6c2c749d3b8 (diff) | |
| download | CMake-3cf71728a17899673f7a07dea9d0242e7d7bff1f.zip CMake-3cf71728a17899673f7a07dea9d0242e7d7bff1f.tar.gz CMake-3cf71728a17899673f7a07dea9d0242e7d7bff1f.tar.bz2 | |
Merge topic 'update-kwsys'
d0c3bf65 Merge branch 'upstream-kwsys' into update-kwsys
bca73252 KWSys 2015-10-06 (d79801bb)
| -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); |