summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2015-07-10 13:04:58 (GMT)
committerBrad King <brad.king@kitware.com>2015-07-13 13:54:33 (GMT)
commit80d75246d475865210aa5bc09e0824b230cd074d (patch)
treeb2d36af0a95ddc2606f9645e2e050a0b40962a3a
parentfed5eb5b0e0e955bf01351b93c43cc248fd9f5ed (diff)
downloadCMake-80d75246d475865210aa5bc09e0824b230cd074d.zip
CMake-80d75246d475865210aa5bc09e0824b230cd074d.tar.gz
CMake-80d75246d475865210aa5bc09e0824b230cd074d.tar.bz2
cmNinjaTargetGenerator: Restore addition of Fortran format flags
Restore call to AppendFortranFormatFlags accidentally dropped by commit 0837538e (cmCommonTargetGenerator: Adopt GetFlags method, 2015-07-09). It was added originally by commit 6a56740e (cmNinjaTargetGenerator: Add Fortran flag generation, 2015-07-09).
-rw-r--r--Source/cmNinjaTargetGenerator.cxx6
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx
index a72bc72..43b9139 100644
--- a/Source/cmNinjaTargetGenerator.cxx
+++ b/Source/cmNinjaTargetGenerator.cxx
@@ -112,6 +112,12 @@ cmNinjaTargetGenerator::ComputeFlagsForObject(cmSourceFile const* source,
{
std::string flags = this->GetFlags(language);
+ // Add Fortran format flags.
+ if(language == "Fortran")
+ {
+ this->AppendFortranFormatFlags(flags, *source);
+ }
+
// Add source file specific flags.
this->LocalGenerator->AppendFlags(flags,
source->GetProperty("COMPILE_FLAGS"));