Bug 182883 - [CMake][Win] Use cmakeconfig.h rather than config.h and Platform.h
Summary: [CMake][Win] Use cmakeconfig.h rather than config.h and Platform.h
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: Tools / Tests (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Don Olmstead
URL:
Keywords: InRadar
Depends on:
Blocks:
 
Reported: 2018-02-16 13:28 PST by Don Olmstead
Modified: 2018-02-21 12:02 PST (History)
7 users (show)

See Also:

Attachments
Patch (11.33 KB, patch)
2018-02-20 13:05 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Patch (11.67 KB, patch)
2018-02-20 15:26 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Patch (11.68 KB, patch)
2018-02-20 15:27 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Patch (11.58 KB, patch)
2018-02-20 15:35 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Patch (10.92 KB, patch)
2018-02-20 16:47 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Patch (10.93 KB, patch)
2018-02-20 16:49 PST, Don Olmstead 		no flags Details | Formatted Diff | Diff
Show Obsolete (5) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Don Olmstead 2018-02-16 13:28:54 PST 
Currently a lot of things within Platform.h and the individual config.h files could be defined in CMake rather than in config.h files. This should hopefully be less error prone than what the config.h files do.

Ports should use SET_AND_EXPOSE_TO_BUILD whenever possible.
Comment 1 Don Olmstead 2018-02-20 13:05:03 PST 
Created attachment 334296 [details]
Patch

Moves a bunch of things to CMake. _WINSOCKAPI_ is defined on WinCairo since it uses Curl.
Comment 2 Don Olmstead 2018-02-20 15:26:42 PST 
Created attachment 334306 [details]
Patch
Comment 3 Don Olmstead 2018-02-20 15:27:45 PST 
Created attachment 334307 [details]
Patch
Comment 4 Don Olmstead 2018-02-20 15:35:11 PST 
Created attachment 334308 [details]
Patch
Comment 5 Don Olmstead 2018-02-20 16:47:12 PST 
Created attachment 334319 [details]
Patch
Comment 6 Don Olmstead 2018-02-20 16:49:57 PST 
Created attachment 334320 [details]
Patch
Comment 7 Konstantin Tokarev 2018-02-20 17:10:55 PST 
LGTM, if there are no special reasons for AppleWin to prefer Platform.h
Comment 8 Per Arne Vollan 2018-02-21 10:16:59 PST 
(In reply to Konstantin Tokarev from comment #7)
> LGTM, if there are no special reasons for AppleWin to prefer Platform.h

From an AppleWin standpoint, I also believe this looks good. Alex, Brent, what do you say?
Comment 9 Per Arne Vollan 2018-02-21 10:19:50 PST 
Comment on attachment 334320 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=334320&action=review

> Source/cmake/OptionsAppleWin.cmake:-11
> -set(USE_ICU_UNICODE 1)

Is this not needed anymore?
Comment 10 Konstantin Tokarev 2018-02-21 10:27:25 PST 
(In reply to Per Arne Vollan from comment #9)
> > -set(USE_ICU_UNICODE 1)
> 
> Is this not needed anymore?

It was removed from code in r162782
Comment 11 Per Arne Vollan 2018-02-21 11:21:14 PST 
Comment on attachment 334320 [details]
Patch

R=me.
Comment 12 WebKit Commit Bot 2018-02-21 12:01:27 PST 
Comment on attachment 334320 [details]
Patch

Clearing flags on attachment: 334320

Committed r228891: <https://trac.webkit.org/changeset/228891>
Comment 13 WebKit Commit Bot 2018-02-21 12:01:29 PST 
All reviewed patches have been landed.  Closing bug.
Comment 14 Radar WebKit Bug Importer 2018-02-21 12:02:29 PST 
<rdar://problem/37755787>