Explorar el Código

CPS: Fix exporting definitions

Export compile definitions to CPS using the correct attribute name.

Fixes: #27403
Matthew Woehlke hace 2 semanas
padre
commit
37b15eda3b

+ 1 - 1
Source/cmExportPackageInfoGenerator.cxx

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

+ 2 - 2
Tests/RunCMake/ExportPackageInfo/InterfaceProperties-check.cmake

@@ -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")

+ 1 - 1
Tests/RunCMake/ExportPackageInfo/Minimal-check.cmake

@@ -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")

+ 2 - 2
Tests/RunCMake/InstallPackageInfo/InterfaceProperties-check.cmake

@@ -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")

+ 1 - 1
Tests/RunCMake/InstallPackageInfo/Minimal-check.cmake

@@ -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")