mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-26 08:29:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'upstream-KWSys' into update-kwsys

Browse Source 
* upstream-KWSys:
  KWSys 2017-06-09 (a700e2ab)
This commit is contained in:
Brad King
2017-06-09 11:03:34 -04:00
parent 591557ba45 a32758782c
commit 3d1c3e0dcf
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/kwsys/SystemTools.cxx
View File

@@ -22,7 +22,6 @@
#include KWSYS_HEADER(FStream.hxx) #include KWSYS_HEADER(FStream.hxx)
#include KWSYS_HEADER(Encoding.hxx) #include KWSYS_HEADER(Encoding.hxx)
#include <algorithm>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
#include <set> #include <set>
@@ -3709,16 +3708,6 @@ std::string SystemTools::JoinPath(
return result; return result;
} }
void SystemTools::RemoveEmptyPathElements(std::vector<std::string>& path)
{
if (path.empty()) {
return;
}
path.erase(std::remove(path.begin() + 1, path.end(), std::string("")),
path.end());
}
bool SystemTools::ComparePath(const std::string& c1, const std::string& c2) bool SystemTools::ComparePath(const std::string& c1, const std::string& c2)
{ {
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) || defined(__APPLE__)

12
Source/kwsys/SystemTools.hxx.in
View File

@@ -461,6 +461,10 @@ public:
* produce the original path. Home directory references are * produce the original path. Home directory references are
* automatically expanded if expand_home_dir is true and this * automatically expanded if expand_home_dir is true and this
* platform supports them. * platform supports them.
*
* This does *not* normalize the input path. All components are
* preserved, including empty ones. Typically callers should use
* this only on paths that have already been normalized.
*/ */
static void SplitPath(const std::string& p, static void SplitPath(const std::string& p,
std::vector<std::string>& components, std::vector<std::string>& components,
@@ -469,15 +473,15 @@ public:
/** /**
* Join components of a path name into a single string. See * Join components of a path name into a single string. See
* SplitPath for the format of the components. * SplitPath for the format of the components.
*
* This does *not* normalize the input path. All components are
* preserved, including empty ones. Typically callers should use
* this only on paths that have already been normalized.
*/ */
static std::string JoinPath(const std::vector<std::string>& components); static std::string JoinPath(const std::vector<std::string>& components);
static std::string JoinPath(std::vector<std::string>::const_iterator first, static std::string JoinPath(std::vector<std::string>::const_iterator first,
std::vector<std::string>::const_iterator last); std::vector<std::string>::const_iterator last);
/** Removes empty components from path.
*/
static void RemoveEmptyPathElements(std::vector<std::string>& path);
/** /**
* Compare a path or components of a path. * Compare a path or components of a path.
*/ */