echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ninja: Populate P1689R4 compiled-module-path field for Fortran

Browse Source 
When scanning Fortran dependencies, we know the file path at which a
provided module file is written.  Store it in the `compiled-module-path`
field as specified by P1689R4.  Our collator in `cmake_ninja_dyndep` no
longer needs to assume that the module file path can be derived from the
logical module name.  In the future, the Fortran dependency scanning may
be done by the compiler itself, in which case it will provide the value
of `compiled-module-path`.
This commit is contained in:
Brad King 2021-06-14 16:25:02 -04:00
parent 10b2e53469
commit a35d121276
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Source/cmGlobalNinjaGenerator.cxx
View File

@ -6,6 +6,7 @@
#include <cctype>
#include <cstdio>
#include <sstream>
#include <utility>
#include <cm/iterator>
#include <cm/memory>
@ -2400,6 +2401,8 @@ cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
cm::optional<cmSourceInfo> info;
cmFortranCompiler fc;
std::vector<std::string> includes;
std::string dir_top_bld;
std::string module_dir;
{
Json::Value tdio;
Json::Value const& tdi = tdio;
@ -2414,6 +2417,11 @@ cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
}
}
dir_top_bld = tdi["dir-top-bld"].asString();
if (!dir_top_bld.empty() && !cmHasLiteralSuffix(dir_top_bld, "/")) {
dir_top_bld += '/';
}
Json::Value const& tdi_include_dirs = tdi["include-dirs"];
if (tdi_include_dirs.isArray()) {
for (auto const& tdi_include_dir : tdi_include_dirs) {
@ -2421,6 +2429,12 @@ cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
}
}
Json::Value const& tdi_module_dir = tdi["module-dir"];
module_dir = tdi_module_dir.asString();
if (!module_dir.empty() && !cmHasLiteralSuffix(module_dir, "/")) {
module_dir += '/';
}
Json::Value const& tdi_compiler_id = tdi["compiler-id"];
fc.Id = tdi_compiler_id.asString();
@ -2448,6 +2462,13 @@ cm::optional<cmSourceInfo> cmcmd_cmake_ninja_depends_fortran(
for (std::string const& provide : finfo.Provides) {
cmSourceReqInfo src_info;
src_info.LogicalName = provide;
if (!module_dir.empty()) {
std::string mod = cmStrCat(module_dir, provide);
if (!dir_top_bld.empty() && cmHasPrefix(mod, dir_top_bld)) {
mod = mod.substr(dir_top_bld.size());
}
src_info.CompiledModulePath = std::move(mod);
}
info->ScanDep.Provides.emplace_back(src_info);
}
for (std::string const& require : finfo.Requires) {