diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2016-11-01 22:35:23 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2016-11-02 14:48:34 (GMT) |
| commit | baead1e2a8ff7938f6be9c5fc01762edddd2ace9 (patch) | |
| tree | 100e2a6a9478a796dc33c31da94ec828239330ef /Source/cmFileCommand.cxx | |
| parent | 713424ad207aa0f5e01f8c16b2ee1c442a91893a (diff) | |
| download | CMake-baead1e2a8ff7938f6be9c5fc01762edddd2ace9.zip CMake-baead1e2a8ff7938f6be9c5fc01762edddd2ace9.tar.gz CMake-baead1e2a8ff7938f6be9c5fc01762edddd2ace9.tar.bz2 | |
Encoding: Remove option to use ANSI code page internally
The switch to use UTF-8 encoding has been defaulted to on for quite some
time since commit v3.2.0-rc1~116^2 (Encoding: Switch to use UTF-8
internally by default on Windows, 2014-12-26).
Diffstat (limited to 'Source/cmFileCommand.cxx')
| -rw-r--r-- | Source/cmFileCommand.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index ac76191..1bade57 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -59,7 +59,7 @@ static mode_t mode_setuid = S_ISUID; static mode_t mode_setgid = S_ISGID; #endif -#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) // libcurl doesn't support file:// urls for unicode filenames on Windows. // Convert string from UTF-8 to ACP if this is a file:// URL. static std::string fix_file_url_windows(const std::string& url) @@ -2642,7 +2642,7 @@ bool cmFileCommand::HandleDownloadCommand(std::vector<std::string> const& args) return false; } -#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) url = fix_file_url_windows(url); #endif @@ -2902,7 +2902,7 @@ bool cmFileCommand::HandleUploadCommand(std::vector<std::string> const& args) unsigned long file_size = cmsys::SystemTools::FileLength(filename); -#if defined(_WIN32) && defined(CMAKE_ENCODING_UTF8) +#if defined(_WIN32) url = fix_file_url_windows(url); #endif |