Bug 144613 - [CMake] FindGTK3.cmake should not modify the values of build options
Summary: [CMake] FindGTK3.cmake should not modify the values of build options
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: 528+ (Nightly build)
Hardware: PC Linux
: P2 Minor
Assignee: Michael Catanzaro
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2015-05-04 18:03 PDT by Michael Catanzaro
Modified: 2015-06-19 19:41 PDT (History)
3 users (show)

See Also:


Attachments
[CMake] FindGTK3.cmake should not modify the values of build options (5.29 KB, patch)
2015-05-12 05:36 PDT, Michael Catanzaro
no flags Details | Formatted Diff | Diff
Patch (4.61 KB, patch)
2015-06-19 17:55 PDT, Michael Catanzaro
no flags Details | Formatted Diff | Diff
Patch (4.61 KB, patch)
2015-06-19 18:05 PDT, Michael Catanzaro
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Michael Catanzaro 2015-05-04 18:03:28 PDT
FindGTK3.cmake touches both ENABLE_X11_TARGET and ENABLE_WAYLAND_TARGET currently. I didn't realize it was doing that (since it is just a find module and I didn't anticipate it having side effects). Anyway, that won't work as expected anymore since this code runs after the values of those settings have already gone into the FEATURE_DEFINES list, so you would wind up with e.g. ENABLE_X11_TARGET turned off for most of the build, but on in other places (like IDL files).
Comment 1 Martin Robinson 2015-05-04 18:34:38 PDT
Nice catch.
Comment 2 Michael Catanzaro 2015-05-12 05:36:01 PDT
Created attachment 252957 [details]
[CMake] FindGTK3.cmake should not modify the values of build options
Comment 3 Michael Catanzaro 2015-06-19 17:36:29 PDT
I will land this without the dependency on the OS X patch.
Comment 4 Michael Catanzaro 2015-06-19 17:55:04 PDT
Created attachment 255258 [details]
Patch
Comment 5 Michael Catanzaro 2015-06-19 18:04:35 PDT
Comment on attachment 255258 [details]
Patch

Typos
Comment 6 Michael Catanzaro 2015-06-19 18:05:41 PDT
Created attachment 255261 [details]
Patch
Comment 7 WebKit Commit Bot 2015-06-19 19:09:50 PDT
The commit-queue encountered the following flaky tests while processing attachment 255261 [details]:

transitions/default-timing-function.html bug 138901 (author: simon.fraser@apple.com)
The commit-queue is continuing to process your patch.
Comment 8 WebKit Commit Bot 2015-06-19 19:09:53 PDT
The commit-queue encountered the following flaky tests while processing attachment 255261 [details]:

The commit-queue is continuing to process your patch.
Comment 9 WebKit Commit Bot 2015-06-19 19:41:53 PDT
Comment on attachment 255261 [details]
Patch

Clearing flags on attachment: 255261

Committed r185788: <http://trac.webkit.org/changeset/185788>
Comment 10 WebKit Commit Bot 2015-06-19 19:41:57 PDT
All reviewed patches have been landed.  Closing bug.