diff options
author | Brad King <brad.king@kitware.com> | 2019-02-13 19:08:34 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2019-02-14 15:23:02 (GMT) |
commit | d80ecba5c27ec249dc85c3a3559db822ef320d05 (patch) | |
tree | 1484c5669fbc156caf8dcd68f624759267428da8 /Source/cmGlobalNinjaGenerator.cxx | |
parent | 72057d9c1582f4b6dec66cd0675860c4c335636e (diff) | |
download | CMake-d80ecba5c27ec249dc85c3a3559db822ef320d05.zip CMake-d80ecba5c27ec249dc85c3a3559db822ef320d05.tar.gz CMake-d80ecba5c27ec249dc85c3a3559db822ef320d05.tar.bz2 |
Fortran: Fix submodule file names across compilers
The naming convention for submodule files varies across compilers. Add
a table to the compiler information modules and thread the information
through to the Fortran module dependency parser. Fill out the table for
compiler ids known to support Fortran submodules.
Fixes: #18746
Diffstat (limited to 'Source/cmGlobalNinjaGenerator.cxx')
-rw-r--r-- | Source/cmGlobalNinjaGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/cmGlobalNinjaGenerator.cxx b/Source/cmGlobalNinjaGenerator.cxx index f5262f0..920f639 100644 --- a/Source/cmGlobalNinjaGenerator.cxx +++ b/Source/cmGlobalNinjaGenerator.cxx @@ -1704,6 +1704,12 @@ int cmcmd_cmake_ninja_depends(std::vector<std::string>::const_iterator argBeg, Json::Value const& tdi_compiler_id = tdi["compiler-id"]; fc.Id = tdi_compiler_id.asString(); + + Json::Value const& tdi_submodule_sep = tdi["submodule-sep"]; + fc.SModSep = tdi_submodule_sep.asString(); + + Json::Value const& tdi_submodule_ext = tdi["submodule-ext"]; + fc.SModExt = tdi_submodule_ext.asString(); } cmFortranSourceInfo info; |