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/cmDependsFortran.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/cmDependsFortran.cxx')
| -rw-r--r-- | Source/cmDependsFortran.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmDependsFortran.cxx b/Source/cmDependsFortran.cxx index fe69d14..3f036a9 100644 --- a/Source/cmDependsFortran.cxx +++ b/Source/cmDependsFortran.cxx @@ -96,6 +96,8 @@ cmDependsFortran::cmDependsFortran(cmLocalGenerator* lg) } this->CompilerId = mf->GetSafeDefinition("CMAKE_Fortran_COMPILER_ID"); + this->SModSep = mf->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_SEP"); + this->SModExt = mf->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_EXT"); } cmDependsFortran::~cmDependsFortran() @@ -120,6 +122,8 @@ bool cmDependsFortran::WriteDependencies(const std::set<std::string>& sources, cmFortranCompiler fc; fc.Id = this->CompilerId; + fc.SModSep = this->SModSep; + fc.SModExt = this->SModExt; bool okay = true; for (std::string const& src : sources) { |