mirror of
https://github.com/reactos/CMake.git
synced 2025-05-15 02:55:50 +00:00
bc877a7e94
Adds a flag to indicate that pipe output from a custom command should be interpreted as UTF-8 encoded. This change does not introduce a public way to set the flag, but generators that create internally-generated commands know if they are calling cmake, which uses UTF-8 pipes. MSBuild added support for interpreting output of PreBuildEvent, PreLinkEvent, PostBuildEvent, and CustomBuildStep as UTF-8. This change will appear in Visual Studio 16.6 Preview 3. It is opt-in, and you need to add the StdOutEncoding tag. MSBuild treats these as property bags so if we emit the tag for earlier versions of Visual Studio it would be safely ignored. This change emits the StdOutEncoding tag and sets it to UTF-8 whenever the custom command UTF-8 pipe flag is set. This fixes globalization issues when the output from cmake contained characters that required MSBuild to interpret as UTF-8 before displaying them.
143 lines
3.2 KiB
C++
143 lines
3.2 KiB
C++
/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying
|
|
file Copyright.txt or https://cmake.org/licensing for details. */
|
|
#include "cmCustomCommand.h"
|
|
|
|
#include <utility>
|
|
|
|
#include <cmext/algorithm>
|
|
|
|
cmCustomCommand::cmCustomCommand(std::vector<std::string> outputs,
|
|
std::vector<std::string> byproducts,
|
|
std::vector<std::string> depends,
|
|
cmCustomCommandLines commandLines,
|
|
cmListFileBacktrace lfbt, const char* comment,
|
|
const char* workingDirectory,
|
|
bool stdPipesUTF8)
|
|
: Outputs(std::move(outputs))
|
|
, Byproducts(std::move(byproducts))
|
|
, Depends(std::move(depends))
|
|
, CommandLines(std::move(commandLines))
|
|
, Backtrace(std::move(lfbt))
|
|
, Comment(comment ? comment : "")
|
|
, WorkingDirectory(workingDirectory ? workingDirectory : "")
|
|
, HaveComment(comment != nullptr)
|
|
, StdPipesUTF8(stdPipesUTF8)
|
|
{
|
|
}
|
|
|
|
const std::vector<std::string>& cmCustomCommand::GetOutputs() const
|
|
{
|
|
return this->Outputs;
|
|
}
|
|
|
|
const std::vector<std::string>& cmCustomCommand::GetByproducts() const
|
|
{
|
|
return this->Byproducts;
|
|
}
|
|
|
|
const std::vector<std::string>& cmCustomCommand::GetDepends() const
|
|
{
|
|
return this->Depends;
|
|
}
|
|
|
|
const cmCustomCommandLines& cmCustomCommand::GetCommandLines() const
|
|
{
|
|
return this->CommandLines;
|
|
}
|
|
|
|
const char* cmCustomCommand::GetComment() const
|
|
{
|
|
const char* no_comment = nullptr;
|
|
return this->HaveComment ? this->Comment.c_str() : no_comment;
|
|
}
|
|
|
|
void cmCustomCommand::AppendCommands(const cmCustomCommandLines& commandLines)
|
|
{
|
|
cm::append(this->CommandLines, commandLines);
|
|
}
|
|
|
|
void cmCustomCommand::AppendDepends(const std::vector<std::string>& depends)
|
|
{
|
|
cm::append(this->Depends, depends);
|
|
}
|
|
|
|
bool cmCustomCommand::GetEscapeOldStyle() const
|
|
{
|
|
return this->EscapeOldStyle;
|
|
}
|
|
|
|
void cmCustomCommand::SetEscapeOldStyle(bool b)
|
|
{
|
|
this->EscapeOldStyle = b;
|
|
}
|
|
|
|
bool cmCustomCommand::GetEscapeAllowMakeVars() const
|
|
{
|
|
return this->EscapeAllowMakeVars;
|
|
}
|
|
|
|
void cmCustomCommand::SetEscapeAllowMakeVars(bool b)
|
|
{
|
|
this->EscapeAllowMakeVars = b;
|
|
}
|
|
|
|
cmListFileBacktrace const& cmCustomCommand::GetBacktrace() const
|
|
{
|
|
return this->Backtrace;
|
|
}
|
|
|
|
cmImplicitDependsList const& cmCustomCommand::GetImplicitDepends() const
|
|
{
|
|
return this->ImplicitDepends;
|
|
}
|
|
|
|
void cmCustomCommand::SetImplicitDepends(cmImplicitDependsList const& l)
|
|
{
|
|
this->ImplicitDepends = l;
|
|
}
|
|
|
|
void cmCustomCommand::AppendImplicitDepends(cmImplicitDependsList const& l)
|
|
{
|
|
cm::append(this->ImplicitDepends, l);
|
|
}
|
|
|
|
bool cmCustomCommand::GetUsesTerminal() const
|
|
{
|
|
return this->UsesTerminal;
|
|
}
|
|
|
|
void cmCustomCommand::SetUsesTerminal(bool b)
|
|
{
|
|
this->UsesTerminal = b;
|
|
}
|
|
|
|
bool cmCustomCommand::GetCommandExpandLists() const
|
|
{
|
|
return this->CommandExpandLists;
|
|
}
|
|
|
|
void cmCustomCommand::SetCommandExpandLists(bool b)
|
|
{
|
|
this->CommandExpandLists = b;
|
|
}
|
|
|
|
const std::string& cmCustomCommand::GetDepfile() const
|
|
{
|
|
return this->Depfile;
|
|
}
|
|
|
|
void cmCustomCommand::SetDepfile(const std::string& depfile)
|
|
{
|
|
this->Depfile = depfile;
|
|
}
|
|
|
|
const std::string& cmCustomCommand::GetJobPool() const
|
|
{
|
|
return this->JobPool;
|
|
}
|
|
|
|
void cmCustomCommand::SetJobPool(const std::string& job_pool)
|
|
{
|
|
this->JobPool = job_pool;
|
|
}
|