diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-13 18:34:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-02-14 15:23:02 (GMT) |
| commit | 72057d9c1582f4b6dec66cd0675860c4c335636e (patch) | |
| tree | a8ef46af1c9bc0c90f2569393aed93f2b4d0f74f /Source/cmGlobalNinjaGenerator.cxx | |
| parent | 7ae329e2ed84f62165cb11794ad85c6c43dbd7dc (diff) | |
| download | CMake-72057d9c1582f4b6dec66cd0675860c4c335636e.zip CMake-72057d9c1582f4b6dec66cd0675860c4c335636e.tar.gz CMake-72057d9c1582f4b6dec66cd0675860c4c335636e.tar.bz2 | |
Fortran: Thread compiler id through to internal Fortran parser
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index 6498024..f5262f0 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1679,6 +1679,7 @@ int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, return 1; } + cmFortranCompiler fc; std::vector<std::string> includes; { Json::Value tdio; @@ -1700,11 +1701,14 @@ int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, includes.push_back(tdi_include_dir.asString()); } } + + Json::Value const& tdi_compiler_id = tdi["compiler-id"]; + fc.Id = tdi_compiler_id.asString(); } cmFortranSourceInfo info; std::set<std::string> defines; - cmFortranParser parser(includes, defines, info); + cmFortranParser parser(fc, includes, defines, info); if (!cmFortranParser_FilePush(&parser, arg_pp.c_str())) { cmSystemTools::Error("-E cmake_ninja_depends failed to open ", arg_pp.c_str()); |