Changeset 286757 in webkit

Timestamp:

Dec 8, 2021, 6:35:12 PM (5 years ago)

Author:

Kyle Piddington

Message:

[MacCatalyst] Update header search paths for ANGLE Catalyst
​https://bugs.webkit.org/show_bug.cgi?id=233996

For iOSMac builds, search for ANGLE public headers inside System/iOSSupport

Reviewed by Dean Jackson.

Source/WebKit:

• Configurations/BaseTarget.xcconfig:

Tools:

• TestWebKitAPI/Configurations/Base.xcconfig:

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/Configurations/BaseTarget.xcconfig (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Configurations/Base.xcconfig (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-08  Kyle Piddington  <kpiddington@apple.com>
+
+        [MacCatalyst] Update header search paths for ANGLE Catalyst
+        https://bugs.webkit.org/show_bug.cgi?id=233996
+
+        For iOSMac builds, search for ANGLE public headers inside System/iOSSupport
+
+        Reviewed by Dean Jackson.
+
+        * Configurations/BaseTarget.xcconfig:
+
 2021-12-08  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit/Configurations/BaseTarget.xcconfig

@@ -48 +48 @@
 LIBWEBRTC_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/webrtc $(SDKROOT)/usr/local/include/webrtc;
 
-HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
+ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
+ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
+
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) $(BUILT_PRODUCTS_DIR)/usr/local/include "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" $(BUILT_PRODUCTS_DIR)/DerivedSources/WebKit "$(BUILT_PRODUCTS_DIR)/usr/local/include/pal/graphics/WebGPU" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(LIBWEBRTC_HEADER_SEARCH_PATHS) $(SRCROOT) $(HEADER_SEARCH_PATHS);
 
 OTHER_CFLAGS = $(inherited) -iframework $(SDKROOT)$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;

trunk/Tools/ChangeLog

@@ +1 @@
+2021-12-08  Kyle Piddington  <kpiddington@apple.com>
+
+        [MacCatalyst] Update header search paths for ANGLE Catalyst
+        https://bugs.webkit.org/show_bug.cgi?id=233996
+
+        For iOSMac builds, search for ANGLE public headers inside System/iOSSupport
+
+        Reviewed by Dean Jackson.
+
+        * TestWebKitAPI/Configurations/Base.xcconfig:
+
 2021-12-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/TestWebKitAPI/Configurations/Base.xcconfig

@@ -34 +34 @@
 CLANG_ENABLE_OBJC_WEAK = YES;
 CLANG_WARN_CXX0X_EXTENSIONS = NO;
-HEADER_SEARCH_PATHS = ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ${SRCROOT} $(SRCROOT)/../../Source/WebKit/Platform/cocoa;
+
+ALTERNATE_HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS_$(SDK_VARIANT));
+ALTERNATE_HEADER_SEARCH_PATHS_iosmac = $(BUILT_PRODUCTS_DIR)$(WK_ALTERNATE_FRAMEWORKS_DIR)/usr/local/include
+
+HEADER_SEARCH_PATHS = $(ALTERNATE_HEADER_SEARCH_PATHS) ${BUILT_PRODUCTS_DIR}/usr/local/include $(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders $(BUILT_PRODUCTS_DIR)/WebCoreTestSupport ${SRCROOT} $(SRCROOT)/../../Source/WebKit/Platform/cocoa;
 
 GCC_NO_COMMON_BLOCKS = YES;