mirror of
https://github.com/Kitware/CMake.git
synced 2026-05-01 03:29:18 -05:00
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys: KWSys 2017-02-06 (ef673998)
This commit is contained in:
@@ -946,7 +946,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
|
|||||||
testConsoleBuf
|
testConsoleBuf
|
||||||
)
|
)
|
||||||
IF("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" AND
|
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)
|
set_property(SOURCE testConsoleBuf.cxx testConsoleBufChild.cxx PROPERTY COMPILE_FLAGS /utf-8)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
SET_PROPERTY(SOURCE testConsoleBuf.cxx APPEND PROPERTY COMPILE_DEFINITIONS
|
SET_PROPERTY(SOURCE testConsoleBuf.cxx APPEND PROPERTY COMPILE_DEFINITIONS
|
||||||
|
|||||||
@@ -3067,6 +3067,28 @@ bool SystemTools::FileIsSymlink(const std::string& name)
|
|||||||
#endif
|
#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__)
|
#if defined(_WIN32) && !defined(__CYGWIN__)
|
||||||
bool SystemTools::CreateSymlink(const std::string&, const std::string&)
|
bool SystemTools::CreateSymlink(const std::string&, const std::string&)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -653,6 +653,11 @@ public:
|
|||||||
*/
|
*/
|
||||||
static bool FileIsSymlink(const std::string& name);
|
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)
|
* Return true if the file has a given signature (first set of bytes)
|
||||||
*/
|
*/
|
||||||
|
|||||||
Reference in New Issue
Block a user