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

cmOutputConverter: Let GetFortranFormat accept a cm::string_view

Browse Source
This commit is contained in:
Sebastian Holtermann 2019-07-28 16:33:47 +02:00
parent 4911762358
commit 8573e20c43
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmOutputConverter.cxx
View File

@ -150,13 +150,11 @@ std::string cmOutputConverter::EscapeWindowsShellArgument(const char* arg,
}
cmOutputConverter::FortranFormat cmOutputConverter::GetFortranFormat(
const char* value)
cm::string_view value)
{
FortranFormat format = FortranFormatNone;
if (value && *value) {
std::vector<std::string> fmt;
cmSystemTools::ExpandListArgument(value, fmt);
for (std::string const& fi : fmt) {
if (!value.empty()) {
for (std::string const& fi : cmSystemTools::ExpandedListArgument(value)) {
if (fi == "FIXED") {
format = FortranFormatFixed;
}
@ -168,6 +166,15 @@ cmOutputConverter::FortranFormat cmOutputConverter::GetFortranFormat(
return format;
}
cmOutputConverter::FortranFormat cmOutputConverter::GetFortranFormat(
const char* value)
{
if (!value) {
return FortranFormatNone;
}
return GetFortranFormat(cm::string_view(value));
}
void cmOutputConverter::SetLinkScriptShell(bool linkScriptShell)
{
this->LinkScriptShell = linkScriptShell;

1
Source/cmOutputConverter.h
View File

@ -89,6 +89,7 @@ public:
FortranFormatFixed,
FortranFormatFree
};
static FortranFormat GetFortranFormat(cm::string_view value);
static FortranFormat GetFortranFormat(const char* value);
private: