mirror/cmake
1
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-01-26 11:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'fix-cps-export-definitions' into release-4.2

Browse Source 
37b15eda3b CPS: Fix exporting definitions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !11436
This commit is contained in:
Brad King 2025-11-22 23:52:29 +00:00 committed by Kitware Robot
commit 976e8ef053
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmExportPackageInfoGenerator.cxx
View File

@ -476,7 +476,7 @@ void cmExportPackageInfoGenerator::GenerateInterfaceCompileDefines(
}
if (!defines.empty()) {
component["compile_definitions"]["*"] = std::move(defines);
component["definitions"]["*"] = std::move(defines);
}
}

4
Tests/RunCMake/ExportPackageInfo/InterfaceProperties-check.cmake
View File

@ -14,8 +14,8 @@ expect_array("${component}" 1 "compile_features")
expect_value("${component}" "c++23" "compile_features" 0)
expect_array("${component}" 1 "compile_flags")
expect_value("${component}" "-ffast-math" "compile_flags" 0)
expect_null("${component}" "compile_definitions" "*" "FOO")
expect_value("${component}" "BAR" "compile_definitions" "*" "BAR")
expect_null("${component}" "definitions" "*" "FOO")
expect_value("${component}" "BAR" "definitions" "*" "BAR")
expect_array("${component}" 1 "link_directories")
expect_value("${component}" "/opt/foo/lib" "link_directories" 0)
expect_array("${component}" 1 "link_flags")

2
Tests/RunCMake/ExportPackageInfo/Minimal-check.cmake
View File

@ -8,7 +8,7 @@ expect_value("${content}" "interface" "components" "foo" "type")
expect_missing("${content}" "version")
expect_missing("${content}" "configurations")
expect_missing("${content}" "default_targets")
expect_missing("${content}" "components" "foo" "compile_definitions")
expect_missing("${content}" "components" "foo" "definitions")
expect_missing("${content}" "components" "foo" "compile_features")
expect_missing("${content}" "components" "foo" "compile_flags")
expect_missing("${content}" "components" "foo" "link_directories")

4
Tests/RunCMake/InstallPackageInfo/InterfaceProperties-check.cmake
View File

@ -14,8 +14,8 @@ expect_array("${component}" 1 "compile_features")
expect_value("${component}" "c++23" "compile_features" 0)
expect_array("${component}" 1 "compile_flags")
expect_value("${component}" "-ffast-math" "compile_flags" 0)
expect_null("${component}" "compile_definitions" "*" "FOO")
expect_value("${component}" "BAR" "compile_definitions" "*" "BAR")
expect_null("${component}" "definitions" "*" "FOO")
expect_value("${component}" "BAR" "definitions" "*" "BAR")
expect_array("${component}" 1 "link_directories")
expect_value("${component}" "/opt/foo/lib" "link_directories" 0)
expect_array("${component}" 1 "link_flags")

2
Tests/RunCMake/InstallPackageInfo/Minimal-check.cmake
View File

@ -8,7 +8,7 @@ expect_value("${content}" "interface" "components" "foo" "type")
expect_missing("${content}" "version")
expect_missing("${content}" "configurations")
expect_missing("${content}" "default_targets")
expect_missing("${content}" "components" "foo" "compile_definitions")
expect_missing("${content}" "components" "foo" "definitions")
expect_missing("${content}" "components" "foo" "compile_features")
expect_missing("${content}" "components" "foo" "compile_flags")
expect_missing("${content}" "components" "foo" "link_directories")