Преглед на файлове

Merge topic 'xcframework-maccatalyst-fix'

984e887e22 .xcframework: Search Info.plist for "maccatalyst" instead of "catalyst"

Acked-by: Kitware Robot <[email protected]>
Acked-by: buildbot <[email protected]>
Merge-request: !8729
Kyle Edwards преди 2 години
родител
ревизия
ac5772be3f
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2 2
      Source/cmXcFramework.cxx
  2. 1 1
      Source/cmXcFramework.h

+ 2 - 2
Source/cmXcFramework.cxx

@@ -80,8 +80,8 @@ bool PlistSupportedPlatformVariantHelper(
     return false;
   }
 
-  if (value->asString() == "catalyst"_s) {
-    variant = cmXcFrameworkPlistSupportedPlatformVariant::catalyst;
+  if (value->asString() == "maccatalyst"_s) {
+    variant = cmXcFrameworkPlistSupportedPlatformVariant::maccatalyst;
     return true;
   }
   if (value->asString() == "simulator"_s) {

+ 1 - 1
Source/cmXcFramework.h

@@ -22,7 +22,7 @@ enum class cmXcFrameworkPlistSupportedPlatform
 
 enum class cmXcFrameworkPlistSupportedPlatformVariant
 {
-  catalyst,
+  maccatalyst,
   simulator,
 };