diff options
author | Brad King <brad.king@kitware.com> | 2017-09-01 14:35:19 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-09-01 14:35:19 (GMT) |
commit | cbf201782205d3e3c7fda33bb1f5828ac13efa1e (patch) | |
tree | 003b82467e2f449369b68835385d66d3860e79f3 /Source/kwsys/SystemTools.cxx | |
parent | 900f75868ce41620947ab4ca376d77e12d32830f (diff) | |
parent | 37760743fc50d9ad864e8a83f0da75ab000c22ec (diff) | |
download | CMake-cbf201782205d3e3c7fda33bb1f5828ac13efa1e.zip CMake-cbf201782205d3e3c7fda33bb1f5828ac13efa1e.tar.gz CMake-cbf201782205d3e3c7fda33bb1f5828ac13efa1e.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2017-09-01 (aee0cf59)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
-rw-r--r-- | Source/kwsys/SystemTools.cxx | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 11f3b81..560c19c 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -2269,11 +2269,7 @@ bool SystemTools::CopyADirectory(const std::string& source, const std::string& destination, bool always) { Directory dir; -#ifdef _WIN32 - dir.Load(Encoding::ToNarrow(Encoding::ToWindowsExtendedPath(source))); -#else dir.Load(source); -#endif size_t fileNum; if (!SystemTools::MakeDirectory(destination)) { return false; @@ -2626,11 +2622,7 @@ bool SystemTools::RemoveADirectory(const std::string& source) } Directory dir; -#ifdef _WIN32 - dir.Load(Encoding::ToNarrow(Encoding::ToWindowsExtendedPath(source))); -#else dir.Load(source); -#endif size_t fileNum; for (fileNum = 0; fileNum < dir.GetNumberOfFiles(); ++fileNum) { if (strcmp(dir.GetFile(static_cast<unsigned long>(fileNum)), ".") && |