Build more testing binaries with CMake on Windows
authorachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Aug 2015 23:42:07 +0000 (23:42 +0000)
committerachristensen@apple.com <achristensen@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 7 Aug 2015 23:42:07 +0000 (23:42 +0000)
commit31db108b733be868c9360d49eb4756b3e96465f5
tree6f8a437aada929f3532a7e7a1d375330d1f87567
parentce793fc65f57350298894a469e54d39f60262e02
Build more testing binaries with CMake on Windows
https://bugs.webkit.org/show_bug.cgi?id=147799

Reviewed by Brent Fulgham.

Source/JavaScriptCore:

* shell/PlatformWin.cmake: Added.
Build jsc.dll and jsc.exe to find Apple Application Support or WinCairo dlls before using them.

Source/WebCore:

* CMakeLists.txt:
MockCDM.cpp needs to be part of WebCoreTestSupport, not WebCore.
* PlatformWin.cmake:
Added files needed for AppleWin port.

Source/WebKit/win:

* WebKitDLL.cpp:
(loadResourceIntoBuffer):
AppleWin doesn't like exporting a function without a separate declaration.

Tools:

* DumpRenderTree/CMakeLists.txt:
Build TestNetscapePlugin.
* DumpRenderTree/PlatformWin.cmake:
Build ImageDiff and add files necessary for TestNetscapePlugin on Windows.
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders: Added.
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit: Added.
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h.
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h.
* DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h: Copied from DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h.
* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h: Removed.
* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h: Removed.
* DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188176 268f45cc-cd09-0410-ab3c-d52691b4dbfc
13 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/shell/PlatformWin.cmake [new file with mode: 0644]
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformWin.cmake
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebKitDLL.cpp
Tools/ChangeLog
Tools/DumpRenderTree/CMakeLists.txt
Tools/DumpRenderTree/PlatformWin.cmake
Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npapi.h [moved from Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npapi.h with 100% similarity]
Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npfunctions.h [moved from Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npfunctions.h with 100% similarity]
Tools/DumpRenderTree/TestNetscapePlugIn/ForwardingHeaders/WebKit/npruntime.h [moved from Tools/DumpRenderTree/TestNetscapePlugIn/unix/ForwardingHeaders/WebKit/npruntime.h with 100% similarity]