| Summary: | Progress towards CMake on Mac | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | WebKit | Reporter: | Alex Christensen <achristensen> | ||||||
| Component: | WebCore Misc. | Assignee: | Alex Christensen <achristensen> | ||||||
| Status: | RESOLVED FIXED | ||||||||
| Severity: | Normal | CC: | ossy | ||||||
| Priority: | P2 | ||||||||
| Version: | 528+ (Nightly build) | ||||||||
| Hardware: | Unspecified | ||||||||
| OS: | Unspecified | ||||||||
| Attachments: |
|
||||||||
|
Description
Alex Christensen
2015-03-16 14:19:56 PDT
Created attachment 248749 [details]
Patch
Comment on attachment 248749 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248749&action=review > Source/WebCore/platform/mac/PasteboardMac.mm:-30 > -#import "DOMRangeInternal.h" how is it related to cmake? > Source/WebKit2/Platform/SharedMemory.h:37 > +#elif PLATFORM(COCOA) > +#include <mach/mach_types.h> an this one? Something is very bad here: ninja: error: dependency cycle: lib/libwebcore_efl.a -> Source/WebCore/CMakeFiles/WebCore.dir/__/__/DerivedSources/WebCore/JSInternalSettings.cpp.o -> DerivedSources/WebCore/JSInternalSettingsGenerated.h -> lib/libwebcore_efl.a Comment on attachment 248749 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248749&action=review >> Source/WebCore/platform/mac/PasteboardMac.mm:-30 >> -#import "DOMRangeInternal.h" > > how is it related to cmake? I disabled generating the ObjC bindings temporarily as a shortcut to get CMake working sooner, then re-enabling it once I get things working. This file is a generated ObjC binding, and I found that including it is not needed. It is not generated with CMake right now with this shortcut. >> Source/WebKit2/Platform/SharedMemory.h:37 >> +#include <mach/mach_types.h> > > an this one? I'm not sure. mach_port_t is not defined in CMake builds, and this fixes that. It might be related to precompiled headers not being used any more. Created attachment 248763 [details]
Patch
Comment on attachment 248763 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=248763&action=review r=me with comments. > Source/WebKit2/PlatformMac.cmake:27 > + UIProcess/API/C Why is this Mac-specific? > Source/WebKit2/PlatformMac.cmake:31 > + UIProcess/API/C/WKPageDiagnosticLoggingClient.h This is not Mac-specific should should probably go in the generic cmake config. I'll put the questioned lines in another patch. Committed the rest of this to http://trac.webkit.org/changeset/181601 |