diff options
author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-27 11:00:00 (GMT) |
---|---|---|
committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-04-27 11:38:47 (GMT) |
commit | 4fd28b9911934553e3dde77ff395f4e9494eaa2e (patch) | |
tree | 3ad2bc9ede9fc8cb4dd3b59f68730b57b3574868 /Source/cmGlobalXCodeGenerator.cxx | |
parent | a4071b53da1d1356f98685e2065bd3d8904d4930 (diff) | |
download | CMake-4fd28b9911934553e3dde77ff395f4e9494eaa2e.zip CMake-4fd28b9911934553e3dde77ff395f4e9494eaa2e.tar.gz CMake-4fd28b9911934553e3dde77ff395f4e9494eaa2e.tar.bz2 |
cmOutputConverter::GetFortranFormat(): delete const char* overload
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 1a753e2..f305246 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -808,9 +808,8 @@ cmXCodeObject* cmGlobalXCodeGenerator::CreateXCodeSourceFile( // Add flags from target and source file properties. std::string flags; - cmProp srcfmt = sf->GetProperty("Fortran_FORMAT"); - switch ( - cmOutputConverter::GetFortranFormat(srcfmt ? srcfmt->c_str() : nullptr)) { + const std::string srcfmt = sf->GetSafeProperty("Fortran_FORMAT"); + switch (cmOutputConverter::GetFortranFormat(srcfmt)) { case cmOutputConverter::FortranFormatFixed: flags = "-fixed " + flags; break; @@ -2290,7 +2289,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmGeneratorTarget* gtgt, // Add Fortran source format attribute if property is set. const char* format = nullptr; - const char* tgtfmt = gtgt->GetProperty("Fortran_FORMAT"); + const std::string tgtfmt = gtgt->GetSafeProperty("Fortran_FORMAT"); switch (cmOutputConverter::GetFortranFormat(tgtfmt)) { case cmOutputConverter::FortranFormatFixed: format = "fixed"; |