diff options
| author | Brad King <brad.king@kitware.com> | 2024-02-21 18:34:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-02-21 18:34:34 (GMT) |
| commit | c66396699bcf3007ce6fe7a1c9735cb18fef4228 (patch) | |
| tree | 5d554bc5d02b94ff6aea53e1479d48609b3c85d9 /Source | |
| parent | d2df2e94e50a003fc635a1913f70ccc784696f15 (diff) | |
| parent | ec348ee4b9f3dec09851f74226f2b0495bf17d8d (diff) | |
| download | CMake-c66396699bcf3007ce6fe7a1c9735cb18fef4228.zip CMake-c66396699bcf3007ce6fe7a1c9735cb18fef4228.tar.gz CMake-c66396699bcf3007ce6fe7a1c9735cb18fef4228.tar.bz2 | |
Merge topic 'cxxmodules-transitive-modules-usage' into release-3.29
ec348ee4b9 cmGeneratorTarget: discover synthetic targets recursively
67466ddf65 cmExportFileGenerator: export link libraries as-is
a2e3e61a31 Tests/CXXModules: test transitive modules usage
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9273
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmExportFileGenerator.cxx | 6 | ||||
| -rw-r--r-- | Source/cmGeneratorTarget.cxx | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/cmExportFileGenerator.cxx b/Source/cmExportFileGenerator.cxx index f332007..21f7639 100644 --- a/Source/cmExportFileGenerator.cxx +++ b/Source/cmExportFileGenerator.cxx @@ -1486,11 +1486,7 @@ bool cmExportFileGenerator::PopulateCxxModuleExportProperties( auto value = cmGeneratorExpression::Preprocess(*prop, ctx); this->ResolveTargetsInGeneratorExpressions( value, gte, cmExportFileGenerator::ReplaceFreeTargets); - std::vector<std::string> wrappedValues; - for (auto& item : cmList{ value }) { - wrappedValues.push_back(cmStrCat("$<COMPILE_ONLY:", item, '>')); - } - properties[exportedPropName] = cmJoin(wrappedValues, ";"); + properties[exportedPropName] = value; } } diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx index 28ee442..3913c99 100644 --- a/Source/cmGeneratorTarget.cxx +++ b/Source/cmGeneratorTarget.cxx @@ -8478,6 +8478,7 @@ bool cmGeneratorTarget::DiscoverSyntheticTargets(cmSyntheticTargetCache& cache, auto gtp = cm::make_unique<cmGeneratorTarget>(tgt, lg); synthDep = gtp.get(); cache.CxxModuleTargets[targetName] = synthDep; + gtp->DiscoverSyntheticTargets(cache, config); lg->AddGeneratorTarget(std::move(gtp)); } else { synthDep = cached->second; |