diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-13 12:21:00 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-13 12:21:25 (GMT) |
| commit | 18b356801874cdca9dd87a2c42e80417f7eb8f15 (patch) | |
| tree | f1ee35c8ae5c79c5b1234f7f638fb52760bfff08 | |
| parent | 8fcd3ecb2a4b515cb06e75d53a90eb4ed4017e60 (diff) | |
| parent | 113cc4c684a7fba7bb72284d654e8615b201a018 (diff) | |
| download | CMake-18b356801874cdca9dd87a2c42e80417f7eb8f15.zip CMake-18b356801874cdca9dd87a2c42e80417f7eb8f15.tar.gz CMake-18b356801874cdca9dd87a2c42e80417f7eb8f15.tar.bz2 | |
Merge topic 'ctest-libuv-exe-network-path'
113cc4c684 libuv: Allow windows UNC path with forward slashes
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6330
| -rw-r--r-- | Utilities/cmlibuv/src/win/process.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Utilities/cmlibuv/src/win/process.c b/Utilities/cmlibuv/src/win/process.c index 04718db..aada889 100644 --- a/Utilities/cmlibuv/src/win/process.c +++ b/Utilities/cmlibuv/src/win/process.c @@ -169,7 +169,10 @@ static WCHAR* search_path_join_test(const WCHAR* dir, size_t cwd_len) { WCHAR *result, *result_pos; DWORD attrs; - if (dir_len > 2 && dir[0] == L'\\' && dir[1] == L'\\') { + if ( + (dir_len > 2 && dir[0] == L'\\' && dir[1] == L'\\') || + (dir_len > 2 && dir[0] == L'/' && dir[1] == L'/') + ) { /* It's a UNC path so ignore cwd */ cwd_len = 0; } else if (dir_len >= 1 && (dir[0] == L'/' || dir[0] == L'\\')) { |