Clean up CMake build after r188673
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 19:08:06 +0000 (19:08 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 20 Aug 2015 19:08:06 +0000 (19:08 +0000)
commit8522b53ae501b9e941300aeaa4f433348e41f604
tree821b280372e3db3cc23563a9c9145bbe5d3d09b6
parente961e3c620de8c6c4135e391ad59c3b6ef3a8905
Clean up CMake build after r188673
https://bugs.webkit.org/show_bug.cgi?id=148234

Reviewed by Tim Horton.

Source/JavaScriptCore:

* shell/PlatformWin.cmake:
Define WIN_CAIRO so the WinCairo jsc.exe can find the correct dlls.

Source/ThirdParty:

* gtest/CMakeLists.txt:
gtest needs to be a static library on Windows to not crash.

Source/ThirdParty/ANGLE:

* CMakeLists.txt:
Copy headers to forwarding headers.

Source/WebCore:

* CMakeLists.txt:
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* PlatformWin.cmake:
Make including ANGLE headers platform specific because EFL and GTK don't want to copy headers,
but we need to in order to get the Windows build working with each Source subdirectory isolated.

Source/WebKit:

* PlatformWin.cmake:
Include ANGLE forwarding headers directories.

Tools:

* DumpRenderTree/PlatformWin.cmake:
* TestWebKitAPI/CMakeLists.txt:
* TestWebKitAPI/PlatformWin.cmake:
Define WIN_CAIRO so WinCairo executables can find the correct dlls in WebKitLibraries.
gtest needs to be a static library on Windows to not crash.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188694 268f45cc-cd09-0410-ab3c-d52691b4dbfc
17 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/PlatformWin.cmake
Source/ThirdParty/ANGLE/CMakeLists.txt
Source/ThirdParty/ANGLE/ChangeLog
Source/ThirdParty/ChangeLog
Source/ThirdParty/gtest/CMakeLists.txt
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/PlatformWin.cmake
Source/WebKit/ChangeLog
Source/WebKit/PlatformWin.cmake
Tools/ChangeLog
Tools/DumpRenderTree/PlatformWin.cmake
Tools/TestWebKitAPI/CMakeLists.txt
Tools/TestWebKitAPI/PlatformWin.cmake