Fix quirks in CMake build on Mac and Windows
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jul 2015 17:04:03 +0000 (17:04 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 22 Jul 2015 17:04:03 +0000 (17:04 +0000)
commitd478d206c5cab8cebb61315a3afe2ebe98c68a3c
tree4bd0f854b1a8e23deb9215cdfc754ef8e3dbcab3
parentb9b335affd1ff1e7acb216f398fc79dcd2e9266a
Fix quirks in CMake build on Mac and Windows
https://bugs.webkit.org/show_bug.cgi?id=147174

Reviewed by Gyuyoung Kim.

.:

* CMakeLists.txt:
* Source/cmake/OptionsWindows.cmake:
Added options I removed in r187022. They are indeed needed.
* Source/cmake/WebKitFS.cmake:
Make the DerivedSources/WebKit directory.

Source/JavaScriptCore:

* PlatformMac.cmake:
Add JSRemoteInspector.cpp and remove semicolon from command to make it actually run.

Source/WebCore:

* PlatformMac.cmake:
Removed files that don't exist any more.
* platform/win/WindowsTouch.h:
Only use definitions of touch structures when compiling with VS2012.

Source/WebKit:

* PlatformMac.cmake:
Fixed syntax, removed files that don't exist any more.

Source/WebKit/win:

* WebView.cpp:
Include winuser.h to get definitions of touch-related structures like tagGESTUREINFO.

Tools:

* CMakeLists.txt:
Don't build DumpRenderTree with CMake for now (until we get that working).
* WinLauncher/CMakeLists.txt:
Renamed WinLauncherLauncher to WinLauncher and WinLauncher to WinLauncherLib to match the Visual Studio build.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@187161 268f45cc-cd09-0410-ab3c-d52691b4dbfc
16 files changed:
CMakeLists.txt
ChangeLog
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/PlatformMac.cmake
Source/WebCore/ChangeLog
Source/WebCore/PlatformMac.cmake
Source/WebCore/platform/win/WindowsTouch.h
Source/WebKit/ChangeLog
Source/WebKit/PlatformMac.cmake
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/cmake/OptionsWindows.cmake
Source/cmake/WebKitFS.cmake
Tools/CMakeLists.txt
Tools/ChangeLog
Tools/WinLauncher/CMakeLists.txt