diff options
| author | Brad King <brad.king@kitware.com> | 2019-02-14 15:25:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-02-14 15:25:15 (GMT) |
| commit | 0069825f50c83b8144374150dd682d48c84f6874 (patch) | |
| tree | a3577f2d2da4f0e3ce81bf0385b5be50ce1d4604 /Source/cmNinjaTargetGenerator.cxx | |
| parent | 50ba2f019baa3e5487a975cb72059f1fc178f9d0 (diff) | |
| parent | d80ecba5c27ec249dc85c3a3559db822ef320d05 (diff) | |
| download | CMake-0069825f50c83b8144374150dd682d48c84f6874.zip CMake-0069825f50c83b8144374150dd682d48c84f6874.tar.gz CMake-0069825f50c83b8144374150dd682d48c84f6874.tar.bz2 | |
Merge topic 'fortran-submodule-names'
d80ecba5c2 Fortran: Fix submodule file names across compilers
72057d9c15 Fortran: Thread compiler id through to internal Fortran parser
7ae329e2ed Fortran: Factor out .mod and .smod file name construction
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.co>
Merge-request: !2958
Diffstat (limited to 'Source/cmNinjaTargetGenerator.cxx')
| -rw-r--r-- | Source/cmNinjaTargetGenerator.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/cmNinjaTargetGenerator.cxx b/Source/cmNinjaTargetGenerator.cxx index b525dac..998729f 100644 --- a/Source/cmNinjaTargetGenerator.cxx +++ b/Source/cmNinjaTargetGenerator.cxx @@ -1143,6 +1143,10 @@ void cmNinjaTargetGenerator::WriteTargetDependInfo(std::string const& lang) mod_dir = this->Makefile->GetCurrentBinaryDirectory(); } tdi["module-dir"] = mod_dir; + tdi["submodule-sep"] = + this->Makefile->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_SEP"); + tdi["submodule-ext"] = + this->Makefile->GetSafeDefinition("CMAKE_Fortran_SUBMODULE_EXT"); } tdi["dir-cur-bld"] = this->Makefile->GetCurrentBinaryDirectory(); |