mirror of
https://gitlab.kitware.com/cmake/cmake.git
synced 2026-10-11 23:43:58 +03:00
Merge topic 'cps-fix-config-import' into release-4.0
0ba5343b66 cmPackageInfoReader: Fix configuration-specific importing
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !10330
This commit is contained in:
commit
8e38ea12ec
1 file changed
+7
@@ -527,6 +527,13 @@ void cmPackageInfoReader::SetTargetProperties(
|
||||
cmMakefile* makefile, cmTarget* target, Json::Value const& data,
|
||||
std::string const& package, cm::string_view configuration) const
|
||||
{
|
||||
// Add configuration (if applicable).
|
||||
if (!configuration.empty()) {
|
||||
target->AppendProperty("IMPORTED_CONFIGURATIONS",
|
||||
cmSystemTools::UpperCase(configuration),
|
||||
makefile->GetBacktrace());
|
||||
}
|
||||
|
||||
// Add compile and link features.
|
||||
for (std::string const& def : ReadList(data, "compile_features")) {
|
||||
AddCompileFeature(makefile, target, configuration, def);
|
||||
|
||||
Reference in new issue
Block a user