Progress towards CMake on Mac.
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2015 21:22:46 +0000 (21:22 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2015 21:22:46 +0000 (21:22 +0000)
commitb173f09d81381582efe475ab45eec30ec66191e0
tree56313aed1aae1ed0027c945265f94f9b120f1319
parent0e770b90d6523301194860f1ae45f47db7aa95e0
Progress towards CMake on Mac.
https://bugs.webkit.org/show_bug.cgi?id=149123

Reviewed by Chris Dumez.

.:

* Source/cmake/OptionsMac.cmake:
* Source/cmake/WebKitFeatures.cmake:
Defined and enabled some more features needed on Mac.
* Source/cmake/WebKitMacros.cmake:
Objective C bindings need special changes when generating:
Some of the bindings do not generate a .mm file but the header is needed.
Some of the bindings do generate a .mm file that doesn't compile but the header is needed.
In order to handle these cases, it is necessary to change the GENERATE_BINDINGS macro just for ObjC.

Source/JavaScriptCore:

* CMakeLists.txt:
Make forwarding headers for the replay subdirectory.
* PlatformMac.cmake:
Make forwarding headers for the generated inspector headers.
They should eventually either be packaged correctly with JavaScriptCore headers and included correctly.

Source/WebCore:

* CMakeLists.txt:
Added some more files.
* PlatformMac.cmake:
Added more files and listed the strange ObjC bindings.
* contentextensions/DFACombiner.cpp:
* contentextensions/DFACombiner.h:
Added preprocessor protection.
* platform/FileSystem.h:
Include utility.  It's needed to compile the different configurations.
* platform/ScrollAnimator.cpp:
ScrollAnimator is an abstract class on Mac.  Don't compile it.
* platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm:
FontAntialiasingStateSaver.h is only used on iOS.
* rendering/RenderThemeMac.mm:
config.h needs to be outside the #if !PLATFORM(IOS) to compile correctly without precompiled headers.

Source/WebKit:

* CMakeLists.txt:
* PlatformMac.cmake:
Added more sources, make non-c99 sources compile as objc++
* PlatformWin.cmake:
Moved WebCoreTestSupport sources and includes to CMakeLists.txt to share.

Source/WebKit/mac:

* WebView/WebPDFDocumentExtras.mm:
(appendValuesInPDFNameSubtreeToVector):
* WebView/WebPDFView.mm:
Removed cmake include quirks that are not needed when we include things correctly from Quartz.framework/Frameworks.

Source/WebKit2:

* PlatformMac.cmake:
Added some more sources.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@189749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
25 files changed:
ChangeLog
Source/JavaScriptCore/CMakeLists.txt
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/contentextensions/DFACombiner.cpp
Source/WebCore/contentextensions/DFACombiner.h
Source/WebCore/platform/FileSystem.h
Source/WebCore/platform/ScrollAnimator.cpp
Source/WebCore/platform/graphics/ca/cocoa/PlatformCALayerCocoa.mm
Source/WebCore/rendering/RenderThemeMac.mm
Source/WebKit/CMakeLists.txt
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/PlatformWin.cmake
Source/WebKit/mac/ChangeLog
Source/WebKit/mac/WebView/WebPDFDocumentExtras.mm
Source/WebKit/mac/WebView/WebPDFView.mm
Source/WebKit2/ChangeLog
Source/WebKit2/PlatformMac.cmake
Source/cmake/OptionsMac.cmake
Source/cmake/WebKitFeatures.cmake
Source/cmake/WebKitMacros.cmake