kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

call static cmOutputConverter::GetFortranFormat without object

This commit is contained in:
Daniel Pfeifer 2016-06-05 23:44:39 +02:00
parent d546456765
commit ba5fb16519
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmCommonTargetGenerator.cxx
View File

@ -178,10 +178,10 @@ void cmCommonTargetGenerator::AppendFortranFormatFlags(
{ {
const char* srcfmt = source.GetProperty("Fortran_FORMAT"); const char* srcfmt = source.GetProperty("Fortran_FORMAT");
cmOutputConverter::FortranFormat format = cmOutputConverter::FortranFormat format =
this->LocalGenerator->GetFortranFormat(srcfmt); cmOutputConverter::GetFortranFormat(srcfmt);
if (format == cmOutputConverter::FortranFormatNone) { if (format == cmOutputConverter::FortranFormatNone) {
const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT"); const char* tgtfmt = this->GeneratorTarget->GetProperty("Fortran_FORMAT");
format = this->LocalGenerator->GetFortranFormat(tgtfmt); format = cmOutputConverter::GetFortranFormat(tgtfmt);
} }
const char* var = 0; const char* var = 0;
switch (format) { switch (format) {

4
Source/cmGlobalXCodeGenerator.cxx
View File

@ -659,7 +659,7 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile(
// Add flags from target and source file properties. // Add flags from target and source file properties.
std::string flags; std::string flags;
const char* srcfmt = sf->GetProperty("Fortran_FORMAT"); const char* srcfmt = sf->GetProperty("Fortran_FORMAT");
switch (this->CurrentLocalGenerator->GetFortranFormat(srcfmt)) { switch (cmOutputConverter::GetFortranFormat(srcfmt)) {
case cmOutputConverter::FortranFormatFixed: case cmOutputConverter::FortranFormatFixed:
flags = "-fixed " + flags; flags = "-fixed " + flags;
break; break;
@ -1981,7 +1981,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt,
// Add Fortran source format attribute if property is set. // Add Fortran source format attribute if property is set.
const char* format = 0; const char* format = 0;
const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT"); const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT");
switch (this->CurrentLocalGenerator->GetFortranFormat(tgtfmt)) { switch (cmOutputConverter::GetFortranFormat(tgtfmt)) {
case cmOutputConverter::FortranFormatFixed: case cmOutputConverter::FortranFormatFixed:
format = "fixed"; format = "fixed";
break; break;

6
Source/cmLocalVisualStudio7Generator.cxx
View File

@ -683,7 +683,8 @@ void cmLocalVisualStudio7Generator::WriteConfiguration(
} }
if (this->FortranProject) { if (this->FortranProject) {
switch (this->GetFortranFormat(target->GetProperty("Fortran_FORMAT"))) { switch (cmOutputConverter::GetFortranFormat(
target->GetProperty("Fortran_FORMAT"))) {
case cmOutputConverter::FortranFormatFixed: case cmOutputConverter::FortranFormatFixed:
flags += " -fixed"; flags += " -fixed";
break; break;
@ -1474,7 +1475,8 @@ cmLocalVisualStudio7GeneratorFCInfo::cmLocalVisualStudio7GeneratorFCInfo(
needfc = true; needfc = true;
} }
if (lg->FortranProject) { if (lg->FortranProject) {
switch (lg->GetFortranFormat(sf.GetProperty("Fortran_FORMAT"))) { switch (cmOutputConverter::GetFortranFormat(
sf.GetProperty("Fortran_FORMAT"))) {
case cmOutputConverter::FortranFormatFixed: case cmOutputConverter::FortranFormatFixed:
fc.CompileFlags = "-fixed " + fc.CompileFlags; fc.CompileFlags = "-fixed " + fc.CompileFlags;
needfc = true; needfc = true;