- Revision
- 187997
- Author
- achristen...@apple.com
- Date
- 2015-08-05 16:02:25 -0700 (Wed, 05 Aug 2015)
Log Message
Build DumpRenderTree with CMake.
https://bugs.webkit.org/show_bug.cgi?id=147519
Reviewed by Brent Fulgham.
Source/WebCore:
* CMakeLists.txt:
WebCoreTestSupport is a static library and should not be linked with WebCore.
Source/WebKit:
* CMakeLists.txt:
* PlatformMac.cmake:
* PlatformWin.cmake:
Make the libraries WebKit links with private, which means that CMake will not make everything
that links with WebKit link with everything WebKit links with.
Source/WebKit/win:
* WebView.cpp:
Include JSScriptProfile.h to export toJS(ExecState*, JSDomGlobalObject*, JSC::Profile*) from WebKit.dll.
Tools:
* CMakeLists.txt:
Build the DumpRenderTree directory now that it builds successfully.
* DumpRenderTree/CMakeLists.txt:
Added missing source file and don't link with WebCore.lib.
* DumpRenderTree/PlatformWin.cmake:
Added sources to DumpRenderTreeLib and made DumpRenderTree only build DLLLauncherMain.cpp.
* WinLauncher/CMakeLists.txt:
We need libcmt now that we are not linking with WebCore.lib.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (187996 => 187997)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
@@ -3294,7 +3294,6 @@
set(WebCoreTestSupport_LIBRARIES
_javascript_Core
WTF
- WebCore
)
# Modules that the bindings generator scripts may use
Modified: trunk/Source/WebCore/ChangeLog (187996 => 187997)
--- trunk/Source/WebCore/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebCore/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
@@ -1,3 +1,13 @@
+2015-08-05 Alex Christensen <achristen...@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ WebCoreTestSupport is a static library and should not be linked with WebCore.
+
2015-08-05 Anders Carlsson <ander...@apple.com>
Move some more DatabaseBackendBase functions to Database
Modified: trunk/Source/WebKit/CMakeLists.txt (187996 => 187997)
--- trunk/Source/WebKit/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
@@ -17,9 +17,9 @@
set(WebKit_SYSTEM_INCLUDE_DIRECTORIES "")
set(WebKit_LIBRARIES
- _javascript_Core
- WTF
- WebCore
+ PRIVATE _javascript_Core
+ PRIVATE WTF
+ PRIVATE WebCore
)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
Modified: trunk/Source/WebKit/ChangeLog (187996 => 187997)
--- trunk/Source/WebKit/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
@@ -1,3 +1,16 @@
+2015-08-05 Alex Christensen <achristen...@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformMac.cmake:
+ * PlatformWin.cmake:
+ Make the libraries WebKit links with private, which means that CMake will not make everything
+ that links with WebKit link with everything WebKit links with.
+
2015-08-04 Filip Pizlo <fpi...@apple.com>
Rename Mutex to DeprecatedMutex
Modified: trunk/Source/WebKit/PlatformMac.cmake (187996 => 187997)
--- trunk/Source/WebKit/PlatformMac.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/PlatformMac.cmake 2015-08-05 23:02:25 UTC (rev 187997)
@@ -28,24 +28,24 @@
link_directories(../../WebKitLibraries)
list(APPEND WebKit_LIBRARIES
- ${ACCELERATE_LIBRARY}
- ${AUDIOTOOLBOX_LIBRARY}
- ${AUDIOUNIT_LIBRARY}
- ${CARBON_LIBRARY}
- ${COCOA_LIBRARY}
- ${COREAUDIO_LIBRARY}
- ${DISKARBITRATION_LIBRARY}
- ${IOKIT_LIBRARY}
- ${IOSURFACE_LIBRARY}
- ${OPENGL_LIBRARY}
- ${PDFKIT_FRAMEWORK}/PDFKit
- ${QUARTZ_LIBRARY}
- ${QUARTZCORE_LIBRARY}
- ${SECURITY_LIBRARY}
- ${SQLITE3_LIBRARY}
- ${WEBKITSYSTEMINTERFACE_LIBRARY}
- ${XML2_LIBRARY}
- ${ZLIB_LIBRARIES}
+ PRIVATE ${ACCELERATE_LIBRARY}
+ PRIVATE ${AUDIOTOOLBOX_LIBRARY}
+ PRIVATE ${AUDIOUNIT_LIBRARY}
+ PRIVATE ${CARBON_LIBRARY}
+ PRIVATE ${COCOA_LIBRARY}
+ PRIVATE ${COREAUDIO_LIBRARY}
+ PRIVATE ${DISKARBITRATION_LIBRARY}
+ PRIVATE ${IOKIT_LIBRARY}
+ PRIVATE ${IOSURFACE_LIBRARY}
+ PRIVATE ${OPENGL_LIBRARY}
+ PRIVATE ${PDFKIT_FRAMEWORK}/PDFKit
+ PRIVATE ${QUARTZ_LIBRARY}
+ PRIVATE ${QUARTZCORE_LIBRARY}
+ PRIVATE ${SECURITY_LIBRARY}
+ PRIVATE ${SQLITE3_LIBRARY}
+ PRIVATE ${WEBKITSYSTEMINTERFACE_LIBRARY}
+ PRIVATE ${XML2_LIBRARY}
+ PRIVATE ${ZLIB_LIBRARIES}
)
list(APPEND WebKit_INCLUDE_DIRECTORIES
Modified: trunk/Source/WebKit/PlatformWin.cmake (187996 => 187997)
--- trunk/Source/WebKit/PlatformWin.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/PlatformWin.cmake 2015-08-05 23:02:25 UTC (rev 187997)
@@ -11,8 +11,8 @@
win/WebURLAuthenticationChallengeSenderCURL.cpp
)
list(APPEND WebKit_LIBRARIES
- libeay32.lib
- ssleay32.lib
+ PRIVATE libeay32.lib
+ PRIVATE ssleay32.lib
)
else ()
list(APPEND WebKit_SOURCES_Classes
@@ -20,7 +20,7 @@
win/WebURLAuthenticationChallengeSenderCFNet.cpp
)
list(APPEND WebKit_LIBRARIES
- WebKitSystemInterface
+ PRIVATE WebKitSystemInterface
)
endif ()
@@ -417,15 +417,15 @@
set_target_properties(WebKitGUID PROPERTIES FOLDER "WebKit")
list(APPEND WebKit_LIBRARIES
- Comctl32
- Comsupp
- Crypt32
- Iphlpapi
- Rpcrt4
- Shlwapi
- Usp10
- Version
- WebKitGUID
+ PRIVATE Comctl32
+ PRIVATE Comsupp
+ PRIVATE Crypt32
+ PRIVATE Iphlpapi
+ PRIVATE Rpcrt4
+ PRIVATE Shlwapi
+ PRIVATE Usp10
+ PRIVATE Version
+ PRIVATE WebKitGUID
)
if (ENABLE_GRAPHICS_CONTEXT_3D)
Modified: trunk/Source/WebKit/win/ChangeLog (187996 => 187997)
--- trunk/Source/WebKit/win/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
@@ -1,3 +1,13 @@
+2015-08-05 Alex Christensen <achristen...@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * WebView.cpp:
+ Include JSScriptProfile.h to export toJS(ExecState*, JSDomGlobalObject*, JSC::Profile*) from WebKit.dll.
+
2015-08-05 Simon Fraser <simon.fra...@apple.com>
Fix Windows build.
Modified: trunk/Source/WebKit/win/WebView.cpp (187996 => 187997)
--- trunk/Source/WebKit/win/WebView.cpp 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-05 23:02:25 UTC (rev 187997)
@@ -120,6 +120,7 @@
#include <WebCore/HitTestResult.h>
#include <WebCore/IntRect.h>
#include <WebCore/JSElement.h>
+#include <WebCore/JSScriptProfile.h>
#include <WebCore/KeyboardEvent.h>
#include <WebCore/Logging.h>
#include <WebCore/MIMETypeRegistry.h>
Modified: trunk/Tools/CMakeLists.txt (187996 => 187997)
--- trunk/Tools/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
@@ -28,7 +28,7 @@
endif ()
if (WIN32)
- # FIXME: Get DumpRenderTree working with CMake.
+ add_subdirectory(DumpRenderTree)
add_subdirectory(WinLauncher)
endif ()
Modified: trunk/Tools/ChangeLog (187996 => 187997)
--- trunk/Tools/ChangeLog 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/ChangeLog 2015-08-05 23:02:25 UTC (rev 187997)
@@ -1,3 +1,19 @@
+2015-08-05 Alex Christensen <achristen...@webkit.org>
+
+ Build DumpRenderTree with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147519
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ Build the DumpRenderTree directory now that it builds successfully.
+ * DumpRenderTree/CMakeLists.txt:
+ Added missing source file and don't link with WebCore.lib.
+ * DumpRenderTree/PlatformWin.cmake:
+ Added sources to DumpRenderTreeLib and made DumpRenderTree only build DLLLauncherMain.cpp.
+ * WinLauncher/CMakeLists.txt:
+ We need libcmt now that we are not linking with WebCore.lib.
+
2015-08-05 Alexey Proskuryakov <a...@apple.com>
AppScale: Use https URLs for subresources and links
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (187996 => 187997)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
@@ -5,6 +5,7 @@
CyclicRedundancyCheck.cpp
DumpRenderTreeCommon.cpp
GCController.cpp
+ _javascript_Threading.cpp
PixelDumpSupport.cpp
TestRunner.cpp
WorkQueue.cpp
@@ -13,7 +14,6 @@
set(DumpRenderTree_LIBRARIES
_javascript_Core
WTF
- WebCore
WebCoreTestSupport
WebKit
)
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (187996 => 187997)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2015-08-05 23:02:25 UTC (rev 187997)
@@ -1,22 +1,64 @@
-list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
- win
-)
-
-list(APPEND DumpRenderTree_SOURCES
+set(DumpRenderTreeLib_SOURCES
+ ${DumpRenderTree_SOURCES}
win/AccessibilityControllerWin.cpp
win/AccessibilityUIElementWin.cpp
+ win/DRTDataObject.cpp
+ win/DRTDesktopNotificationPresenter.cpp
+ win/DRTDropSource.cpp
+ win/DumpRenderTree.cpp
+ win/EditingDelegate.cpp
+ win/EventSender.cpp
+ win/FrameLoadDelegate.cpp
win/GCControllerWin.cpp
+ win/HistoryDelegate.cpp
+ win/MD5.cpp
win/PixelDumpSupportWin.cpp
+ win/PolicyDelegate.cpp
+ win/ResourceLoadDelegate.cpp
win/TestRunnerWin.cpp
+ win/TextInputController.cpp
+ win/TextInputControllerWin.cpp
+ win/UIDelegate.cpp
win/WorkQueueItemWin.cpp
)
+set(DumpRenderTree_SOURCES
+ ${TOOLS_DIR}/win/DLLLauncher/DLLLauncherMain.cpp
+)
+
+list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
+ win
+)
+
+list(APPEND DumpRenderTree_LIBRARIES
+ shlwapi
+)
+
+set(DumpRenderTreeLib_LIBRARIES
+ ${DumpRenderTree_LIBRARIES}
+ Comsuppw
+ Oleacc
+ WebKitGUID
+)
+
if (${WTF_PLATFORM_WIN_CAIRO})
list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
cairo
"$ENV{WEBKIT_LIBRARIES}/include/cairo"
)
- list(APPEND DumpRenderTree_SOURCES
+ list(APPEND DumpRenderTreeLib_SOURCES
cairo/PixelDumpSupportCairo.cpp
)
endif ()
+
+ADD_PRECOMPILED_HEADER("DumpRenderTreePrefix.h" "win/DumpRenderTreePrefix.cpp" DumpRenderTreeLib_SOURCES)
+
+add_library(DumpRenderTreeLib SHARED ${DumpRenderTreeLib_SOURCES})
+set_target_properties(DumpRenderTreeLib PROPERTIES FOLDER "Tools")
+set_target_properties(DumpRenderTreeLib PROPERTIES OUTPUT_NAME "DumpRenderTree")
+target_link_libraries(DumpRenderTreeLib ${DumpRenderTreeLib_LIBRARIES})
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
+
+add_definitions(-D_UNICODE)
+
Modified: trunk/Tools/WinLauncher/CMakeLists.txt (187996 => 187997)
--- trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-05 22:58:52 UTC (rev 187996)
+++ trunk/Tools/WinLauncher/CMakeLists.txt 2015-08-05 23:02:25 UTC (rev 187997)
@@ -45,7 +45,6 @@
)
endif ()
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /ENTRY:wWinMainCRTStartup")
if (${WTF_PLATFORM_WIN_CAIRO})
