Bug 142747 - Progress towards CMake on Mac
Summary: Progress towards CMake on Mac
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebCore Misc. (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Alex Christensen
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-03-16 14:19 PDT by Alex Christensen
Modified: 2015-03-23 09:14 PDT (History)
1 user (show)

See Also:


Attachments
Patch (10.44 KB, patch)
2015-03-16 14:26 PDT, Alex Christensen
no flags Details | Formatted Diff | Diff
Patch (10.14 KB, patch)
2015-03-16 16:09 PDT, Alex Christensen
cdumez: review+
Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Alex Christensen 2015-03-16 14:19:56 PDT
progress
Comment 1 Alex Christensen 2015-03-16 14:26:09 PDT
Created attachment 248749 [details]
Patch
Comment 2 Csaba Osztrogonác 2015-03-16 15:56:06 PDT
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?
Comment 3 Csaba Osztrogonác 2015-03-16 15:57:26 PDT
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 4 Alex Christensen 2015-03-16 16:00:37 PDT
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.
Comment 5 Alex Christensen 2015-03-16 16:09:37 PDT
Created attachment 248763 [details]
Patch
Comment 6 Chris Dumez 2015-03-16 17:22:41 PDT
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.
Comment 7 Alex Christensen 2015-03-16 17:31:15 PDT
I'll put the questioned lines in another patch.  Committed the rest of this to http://trac.webkit.org/changeset/181601