Title: [188116] trunk/Source/WebCore
- Revision
- 188116
- Author
- commit-qu...@webkit.org
- Date
- 2015-08-06 22:15:11 -0700 (Thu, 06 Aug 2015)
Log Message
Fix GTK clean build after r187997
https://bugs.webkit.org/show_bug.cgi?id=147723
Patch by Alex Christensen <achristen...@webkit.org> on 2015-08-06
Reviewed by Gyuyoung Kim.
* CMakeLists.txt:
r187997 made it so WebCoreTestSupport does not link with WebCore, which is necessary to get DumpRenderTree to link.
It also made it so WebCoreTestSupport is no longer dependent on WebCore, which causes it to build at the same time.
This caused problems because WebCoreTestSupport uses headers that are generated for WebCore, such as WebKitFontFamilyNames.h.
Adding a dependency makes it so that WebCoreTestSupport waits until WebCore is done compiling before compiling,
which is what it used to do, but it does not cause linking problems with DumpRenderTree.
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (188115 => 188116)
--- trunk/Source/WebCore/CMakeLists.txt 2015-08-07 05:09:07 UTC (rev 188115)
+++ trunk/Source/WebCore/CMakeLists.txt 2015-08-07 05:15:11 UTC (rev 188116)
@@ -3639,6 +3639,7 @@
endif ()
add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
+add_dependencies(WebCoreTestSupport WebCore)
target_link_libraries(WebCoreTestSupport ${WebCoreTestSupport_LIBRARIES})
set_target_properties(WebCoreTestSupport PROPERTIES FOLDER "WebCore")
Modified: trunk/Source/WebCore/ChangeLog (188115 => 188116)
--- trunk/Source/WebCore/ChangeLog 2015-08-07 05:09:07 UTC (rev 188115)
+++ trunk/Source/WebCore/ChangeLog 2015-08-07 05:15:11 UTC (rev 188116)
@@ -1,3 +1,17 @@
+2015-08-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix GTK clean build after r187997
+ https://bugs.webkit.org/show_bug.cgi?id=147723
+
+ Reviewed by Gyuyoung Kim.
+
+ * CMakeLists.txt:
+ r187997 made it so WebCoreTestSupport does not link with WebCore, which is necessary to get DumpRenderTree to link.
+ It also made it so WebCoreTestSupport is no longer dependent on WebCore, which causes it to build at the same time.
+ This caused problems because WebCoreTestSupport uses headers that are generated for WebCore, such as WebKitFontFamilyNames.h.
+ Adding a dependency makes it so that WebCoreTestSupport waits until WebCore is done compiling before compiling,
+ which is what it used to do, but it does not cause linking problems with DumpRenderTree.
+
2015-08-06 Myles C. Maxfield <mmaxfi...@apple.com>
CSSSegmentedFontFace::fontRanges() does not handle duplicate fonts correctly
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
