diff options
| author | Brad King <brad.king@kitware.com> | 2023-11-27 13:36:28 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-11-27 13:36:45 (GMT) |
| commit | c2bd158712b1ee3465296ee6be369f49747d709d (patch) | |
| tree | eb694c8b3d5669ead72001ea09c8e30c53c1e717 /Source/cmMakefile.cxx | |
| parent | 89cfb90b9c0893133983b4f25896671c4f07497c (diff) | |
| parent | beb1393f8f29302197b80741bec41a13b7f207c7 (diff) | |
| download | CMake-c2bd158712b1ee3465296ee6be369f49747d709d.zip CMake-c2bd158712b1ee3465296ee6be369f49747d709d.tar.gz CMake-c2bd158712b1ee3465296ee6be369f49747d709d.tar.bz2 | |
Merge topic 'fortran-objects-as-sources-fix'
beb1393f8f Merge branch 'revert-exact-collation-depends-3.27' into fortran-objects-as-sources-fix
a033dce326 Makefiles: provide, but do not consume, "forward linked" target dirs
7cd0adab1b cmCommonTargetGenerator: use modules from linked object-referenced targets
1175f1c874 LinkItem: track `cmSourceFile` instances for external objects
d2fa56772f Ninja: support "forwarding" modules from other targets
ec1e589bec Ninja: Revert exact collation dependencies for 3.27
06df59b930 cmCommonTargetGenerator: return forward linked target dirs too
f8729ab366 cmLocalUnixMakefileGenerator3: handle object-referencing Fortran modules
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !8989
Diffstat (limited to 'Source/cmMakefile.cxx')
| -rw-r--r-- | Source/cmMakefile.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index aafef44..936b282 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -3637,6 +3637,9 @@ void cmMakefile::AddTargetObject(std::string const& tgtName, this->GetOrCreateSource(objFile, true, cmSourceFileLocationKind::Known); sf->SetObjectLibrary(tgtName); sf->SetProperty("EXTERNAL_OBJECT", "1"); + // TODO: Compute a language for this object based on the associated source + // file that compiles to it. Needs a policy as it likely affects link + // language selection if done unconditionally. #if !defined(CMAKE_BOOTSTRAP) this->SourceGroups[this->ObjectLibrariesSourceGroupIndex].AddGroupFile( sf->ResolveFullPath()); |