dilim/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-08-05 07:10:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

CPS: Fix exporting definitions

Browse Source 
Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
This commit is contained in:
Matthew Woehlke
2025-11-21 15:32:41 -05:00
parent 3e1933ec55
commit 37b15eda3b
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/cmExportPackageInfoGenerator.cxx
View File

@@ -477,7 +477,7 @@ void cmExportPackageInfoGenerator::GenerateInterfaceCompileDefines(
} }
if (!defines.empty()) { 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_value("${component}" "c++23" "compile_features" 0)
expect_array("${component}" 1 "compile_flags") expect_array("${component}" 1 "compile_flags")
expect_value("${component}" "-ffast-math" "compile_flags" 0) expect_value("${component}" "-ffast-math" "compile_flags" 0)
expect_null("${component}" "compile_definitions" "*" "FOO") expect_null("${component}" "definitions" "*" "FOO")
expect_value("${component}" "BAR" "compile_definitions" "*" "BAR") expect_value("${component}" "BAR" "definitions" "*" "BAR")
expect_array("${component}" 1 "link_directories") expect_array("${component}" 1 "link_directories")
expect_value("${component}" "/opt/foo/lib" "link_directories" 0) expect_value("${component}" "/opt/foo/lib" "link_directories" 0)
expect_array("${component}" 1 "link_flags") 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}" "version")
expect_missing("${content}" "configurations") expect_missing("${content}" "configurations")
expect_missing("${content}" "default_targets") 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_features")
expect_missing("${content}" "components" "foo" "compile_flags") expect_missing("${content}" "components" "foo" "compile_flags")
expect_missing("${content}" "components" "foo" "link_directories") 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_value("${component}" "c++23" "compile_features" 0)
expect_array("${component}" 1 "compile_flags") expect_array("${component}" 1 "compile_flags")
expect_value("${component}" "-ffast-math" "compile_flags" 0) expect_value("${component}" "-ffast-math" "compile_flags" 0)
expect_null("${component}" "compile_definitions" "*" "FOO") expect_null("${component}" "definitions" "*" "FOO")
expect_value("${component}" "BAR" "compile_definitions" "*" "BAR") expect_value("${component}" "BAR" "definitions" "*" "BAR")
expect_array("${component}" 1 "link_directories") expect_array("${component}" 1 "link_directories")
expect_value("${component}" "/opt/foo/lib" "link_directories" 0) expect_value("${component}" "/opt/foo/lib" "link_directories" 0)
expect_array("${component}" 1 "link_flags") 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}" "version")
expect_missing("${content}" "configurations") expect_missing("${content}" "configurations")
expect_missing("${content}" "default_targets") 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_features")
expect_missing("${content}" "components" "foo" "compile_flags") expect_missing("${content}" "components" "foo" "compile_flags")
expect_missing("${content}" "components" "foo" "link_directories") expect_missing("${content}" "components" "foo" "link_directories")