echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

VS: Add support for Utf8Enconding when using VS 16.10+

Browse Source 
On VS 16.10 Preview 2 or above, generate `UseUtf8Encoding`
instead of `StdOutEncoding=UTF-8` in `.vcxproj` files.

Fixes: #22032
This commit is contained in:
Gustavo Varo 2021-06-16 18:05:55 -04:00 committed by Brad King
parent b0f830ced6
commit 9ba99a1203
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmGlobalVisualStudio10Generator.h
View File

@ -138,6 +138,8 @@ public:
virtual bool IsStdOutEncodingSupported() const { return false; }
virtual bool IsUtf8EncodingSupported() const { return false; }
static std::string GetInstalledNsightTegraVersion();
/** Return the first two components of CMAKE_SYSTEM_VERSION. */

15
Source/cmGlobalVisualStudioVersionedGenerator.cxx
View File

@ -417,6 +417,21 @@ bool cmGlobalVisualStudioVersionedGenerator::IsStdOutEncodingSupported() const
cmSystemTools::VersionCompareGreaterEq(*vsVer, vsVer16_7_P2));
}
bool cmGlobalVisualStudioVersionedGenerator::IsUtf8EncodingSupported() const
{
// Supported from Visual Studio 16.10 Preview 2.
if (this->Version > cmGlobalVisualStudioGenerator::VSVersion::VS16) {
return true;
}
if (this->Version < cmGlobalVisualStudioGenerator::VSVersion::VS16) {
return false;
}
static std::string const vsVer16_10_P2 = "16.10.31213.239";
cm::optional<std::string> vsVer = this->GetVSInstanceVersion();
return (vsVer &&
cmSystemTools::VersionCompareGreaterEq(*vsVer, vsVer16_10_P2));
}
const char*
cmGlobalVisualStudioVersionedGenerator::GetAndroidApplicationTypeRevision()
const

2
Source/cmGlobalVisualStudioVersionedGenerator.h
View File

@ -35,6 +35,8 @@ public:
bool IsStdOutEncodingSupported() const override;
bool IsUtf8EncodingSupported() const override;
const char* GetAndroidApplicationTypeRevision() const override;
protected:

4
Source/cmVisualStudio10TargetGenerator.cxx
View File

@ -5115,7 +5115,9 @@ std::string cmVisualStudio10TargetGenerator::GetCMakeFilePath(
void cmVisualStudio10TargetGenerator::WriteStdOutEncodingUtf8(Elem& e1)
{
if (this->GlobalGenerator->IsStdOutEncodingSupported()) {
if (this->GlobalGenerator->IsUtf8EncodingSupported()) {
e1.Element("UseUtf8Encoding", "Always");
} else if (this->GlobalGenerator->IsStdOutEncodingSupported()) {
e1.Element("StdOutEncoding", "UTF-8");
}
}