diff options
author | Brad King <brad.king@kitware.com> | 2023-03-24 19:18:18 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2023-03-24 19:57:52 (GMT) |
commit | 01d7860fdb078dae5198056930e8cfd2ce532d84 (patch) | |
tree | 82783869aace757d4bfd1480b63e5c5f1dc9aa63 /Tests/FortranModules/Executable/main.f90 | |
parent | 846baa7c5bdb3a93a816dfaa2a9e37282fd38d48 (diff) | |
download | CMake-01d7860fdb078dae5198056930e8cfd2ce532d84.zip CMake-01d7860fdb078dae5198056930e8cfd2ce532d84.tar.gz CMake-01d7860fdb078dae5198056930e8cfd2ce532d84.tar.bz2 |
Ninja,Makefile: Restore Fortran module scanning in static library cycle
Since
* commit eed295fd8a (cmGlobalNinjaGenerator: require that dependency info
files work, 2023-02-01, v3.26.0-rc1~1^2~1), and
* commit 13810dee17 (cmDependsFortran: require that dependency info files
work, 2023-02-01, v3.26.0-rc1~1^2),
the Ninja and Makefile generators' module dependency scanning requires
that scanning results from from linked targets is available before
scanning the current target. In the case of a static library cycle,
we cannot expect this information from other static libraries in the
cycle. Previously we supported cyclic cases at the cost of silently
ignoring missing information.
We already compute a global order of targets that respects all
`add_dependencies`, but may break `target_link_libraries` dependencies
that occur in a static library cycle. Use this order to filter the
linked targets so we only expect scanning results to be available from
those targets that build before the current target.
This approach is sufficient to support module dependency scanning in
static library cycles as long as module dependencies do not cross
between two libraries in the same cycle.
Fixes: #24631
Diffstat (limited to 'Tests/FortranModules/Executable/main.f90')
-rw-r--r-- | Tests/FortranModules/Executable/main.f90 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Tests/FortranModules/Executable/main.f90 b/Tests/FortranModules/Executable/main.f90 index 640259c..218eee6 100644 --- a/Tests/FortranModules/Executable/main.f90 +++ b/Tests/FortranModules/Executable/main.f90 @@ -3,5 +3,9 @@ PROGRAM MAINF90 USE libraryModuleB USE subdirModuleA USE externalMod + USE libraryCycleA + USE libraryCycleB CALL printExtModGreeting + CALL libraryCycleA2 + CALL libraryCycleB2 END PROGRAM MAINF90 |