diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-07 14:59:36 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-02-07 14:59:36 (GMT) |
| commit | 7642ca21b7d21f41b41703a6d1bef1d6f3c1e564 (patch) | |
| tree | 657833dc3db01d3367b86a585f79a718c700870e | |
| parent | 0a09717ea3171bf9dda97e22e796c4cdbeed717b (diff) | |
| parent | c2645e1979f83b1550d977cee0cdb80122daf8e0 (diff) | |
| download | CMake-7642ca21b7d21f41b41703a6d1bef1d6f3c1e564.zip CMake-7642ca21b7d21f41b41703a6d1bef1d6f3c1e564.tar.gz CMake-7642ca21b7d21f41b41703a6d1bef1d6f3c1e564.tar.bz2 | |
Merge topic 'update-kwsys'
c2645e19 Merge branch 'upstream-KWSys' into update-kwsys
95983ed8 KWSys 2017-02-06 (ef673998)
| -rw-r--r-- | Source/kwsys/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 22 | ||||
| -rw-r--r-- | Source/kwsys/SystemTools.hxx.in | 5 |
3 files changed, 28 insertions, 1 deletions
diff --git a/Source/kwsys/CMakeLists.txt b/Source/kwsys/CMakeLists.txt index d4fe8a7..de68118 100644 --- a/Source/kwsys/CMakeLists.txt +++ b/Source/kwsys/CMakeLists.txt @@ -946,7 +946,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR) testConsoleBuf ) IF("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" AND - NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0") + CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "19.0.23506") set_property(SOURCE testConsoleBuf.cxx testConsoleBufChild.cxx PROPERTY COMPILE_FLAGS /utf-8) ENDIF() SET_PROPERTY(SOURCE testConsoleBuf.cxx APPEND PROPERTY COMPILE_DEFINITIONS diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index 97dd4ae..8c82ec1 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -3067,6 +3067,28 @@ bool SystemTools::FileIsSymlink(const std::string& name) #endif } +bool SystemTools::FileIsFIFO(const std::string& name) +{ +#if defined(_WIN32) + HANDLE hFile = + CreateFileW(Encoding::ToWide(name).c_str(), GENERIC_READ, FILE_SHARE_READ, + NULL, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS, NULL); + if (hFile == INVALID_HANDLE_VALUE) { + return false; + } + const DWORD type = GetFileType(hFile); + CloseHandle(hFile); + return type == FILE_TYPE_PIPE; +#else + struct stat fs; + if (lstat(name.c_str(), &fs) == 0) { + return S_ISFIFO(fs.st_mode); + } else { + return false; + } +#endif +} + #if defined(_WIN32) && !defined(__CYGWIN__) bool SystemTools::CreateSymlink(const std::string&, const std::string&) { diff --git a/Source/kwsys/SystemTools.hxx.in b/Source/kwsys/SystemTools.hxx.in index f3d06fe..7a5256b 100644 --- a/Source/kwsys/SystemTools.hxx.in +++ b/Source/kwsys/SystemTools.hxx.in @@ -654,6 +654,11 @@ public: static bool FileIsSymlink(const std::string& name); /** + * Return true if the file is a FIFO + */ + static bool FileIsFIFO(const std::string& name); + + /** * Return true if the file has a given signature (first set of bytes) */ static bool FileHasSignature(const char* filename, const char* signature, |