diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
| commit | 81870f1159a7b2649b027a6c3f75eba555831488 (patch) | |
| tree | 05eb767f2f2becb6480cfe348d08ebca4e1fc1cf /Source/kwsys/Glob.cxx | |
| parent | eed0df951d95d48e7856107175a2baba212c3206 (diff) | |
| parent | 3af8c7715b359affce99c575bdcb84ca87585bb2 (diff) | |
| download | CMake-81870f1159a7b2649b027a6c3f75eba555831488.zip CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.gz CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
Diffstat (limited to 'Source/kwsys/Glob.cxx')
| -rw-r--r-- | Source/kwsys/Glob.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Source/kwsys/Glob.cxx b/Source/kwsys/Glob.cxx index 2b6db78..6952d24 100644 --- a/Source/kwsys/Glob.cxx +++ b/Source/kwsys/Glob.cxx @@ -12,11 +12,11 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -#include "Configure.hxx.in" -#include "Directory.hxx.in" -#include "Glob.hxx.in" -#include "RegularExpression.hxx.in" -#include "SystemTools.hxx.in" +# include "Configure.hxx.in" +# include "Directory.hxx.in" +# include "Glob.hxx.in" +# include "RegularExpression.hxx.in" +# include "SystemTools.hxx.in" #endif #include <algorithm> @@ -29,12 +29,12 @@ namespace KWSYS_NAMESPACE { #if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__) // On Windows and Apple, no difference between lower and upper case -#define KWSYS_GLOB_CASE_INDEPENDENT +# define KWSYS_GLOB_CASE_INDEPENDENT #endif #if defined(_WIN32) || defined(__CYGWIN__) // Handle network paths -#define KWSYS_GLOB_SUPPORT_NETWORK_PATHS +# define KWSYS_GLOB_SUPPORT_NETWORK_PATHS #endif class GlobInternals @@ -217,9 +217,10 @@ bool Glob::RecurseDirectory(std::string::size_type start, if (!realPathErrorMessage.empty()) { if (messages) { - messages->push_back(Message( - Glob::error, "Canonical path generation from path '" + dir + - "' failed! Reason: '" + realPathErrorMessage + "'")); + messages->push_back( + Message(Glob::error, + "Canonical path generation from path '" + dir + + "' failed! Reason: '" + realPathErrorMessage + "'")); } return false; } |