diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-31 17:11:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-31 17:11:58 (GMT) |
| commit | 5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8 (patch) | |
| tree | a73f41ac49686a9adc8bb27d0c9729833a22580d /Source/kwsys/Glob.cxx | |
| parent | 8b16e62c7a10c246744327cde38b0b1d70eb8c48 (diff) | |
| parent | 72b5b48040ed65fdb54b8ffeb3326b456586b8c8 (diff) | |
| download | CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.zip CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.gz CMake-5868b4e2fb7aa7de34403cae7dbc7a827d70a8e8.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/Glob.cxx')
| -rw-r--r-- | Source/kwsys/Glob.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/kwsys/Glob.cxx b/Source/kwsys/Glob.cxx index 0916d2e..5a96aed 100644 --- a/Source/kwsys/Glob.cxx +++ b/Source/kwsys/Glob.cxx @@ -501,7 +501,7 @@ void Glob::AddFile(kwsys_stl::vector<kwsys_stl::string>& files, const kwsys_stl: { if ( !this->Relative.empty() ) { - files.push_back(kwsys::SystemTools::RelativePath(this->Relative.c_str(), file.c_str())); + files.push_back(kwsys::SystemTools::RelativePath(this->Relative, file)); } else { |