Skip to content

Commit 1ae6ad6

Browse files
Darwin: Add a module map for Matter.framework marking it as system (project-chip#37165)
This affects how NSUInteger is bridged into Swift when building locally.
1 parent 87de90d commit 1ae6ad6

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
framework module Matter [system] {
2+
umbrella header "Matter.h"
3+
export *
4+
module * { export * }
5+
}

src/darwin/Framework/Matter.xcodeproj/project.pbxproj

+4
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,7 @@
802802
75B765BF2A1D70F80014719B /* MTRAttributeSpecifiedCheck-src.zapt */ = {isa = PBXFileReference; lastKnownFileType = text; path = "MTRAttributeSpecifiedCheck-src.zapt"; sourceTree = "<group>"; };
803803
75B765C02A1D71BC0014719B /* MTRAttributeSpecifiedCheck.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MTRAttributeSpecifiedCheck.h; sourceTree = "<group>"; };
804804
75B765C22A1D82D30014719B /* MTRAttributeSpecifiedCheck.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MTRAttributeSpecifiedCheck.mm; sourceTree = "<group>"; };
805+
7CD490112D378CF4007F9145 /* Matter.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; path = Matter.modulemap; sourceTree = "<group>"; };
805806
8874C1312B69C7060084BEFD /* MTRMetricsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MTRMetricsTests.m; sourceTree = "<group>"; };
806807
88E07D602B9A89A4005FD53E /* MTRMetricKeys.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRMetricKeys.h; sourceTree = "<group>"; };
807808
88E6C9432B6334ED001A1FE0 /* MTRMetrics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MTRMetrics.h; sourceTree = "<group>"; };
@@ -1415,6 +1416,7 @@
14151416
B202528F2459E34F00F97062 /* CHIP */ = {
14161417
isa = PBXGroup;
14171418
children = (
1419+
7CD490112D378CF4007F9145 /* Matter.modulemap */,
14181420
CF3B63CB2CA31E71003C1C87 /* MTROTAImageTransferHandler.h */,
14191421
CF3B63CD2CA31E71003C1C87 /* MTROTAImageTransferHandler.mm */,
14201422
CF3B63CC2CA31E71003C1C87 /* MTROTAUnsolicitedBDXMessageHandler.h */,
@@ -2654,6 +2656,7 @@
26542656
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
26552657
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
26562658
LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
2659+
MODULEMAP_FILE = CHIP/Matter.modulemap;
26572660
OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
26582661
OTHER_CPLUSPLUSFLAGS = (
26592662
"$(OTHER_CFLAGS)",
@@ -2823,6 +2826,7 @@
28232826
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
28242827
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
28252828
LIBRARY_SEARCH_PATHS = "$(TEMP_DIR)/out/lib";
2829+
MODULEMAP_FILE = CHIP/Matter.modulemap;
28262830
OTHER_CFLAGS = "-fmacro-prefix-map=$(SRCROOT)/CHIP/=";
28272831
OTHER_CPLUSPLUSFLAGS = (
28282832
"$(OTHER_CFLAGS)",

0 commit comments

Comments
 (0)