Title: [260534] trunk
- Revision
- 260534
- Author
- [email protected]
- Date
- 2020-04-22 15:16:31 -0700 (Wed, 22 Apr 2020)
Log Message
[CMake] Add WebKit::WebCoreTestSupport target
https://bugs.webkit.org/show_bug.cgi?id=210867
Reviewed by Michael Catanzaro.
Source/WebCore:
Add the WebKit::WebCoreTestSupport target. Modify WebCoreTestSupport to only
have a dependency on WebCore if WebCore is built as a shared library.
* CMakeLists.txt:
Tools:
Use the WebKit::WebCoreTestSupport target in DumpRenderTree. Fix an
include for WPE in WebKitTestRunner.
* DumpRenderTree/CMakeLists.txt:
* DumpRenderTree/PlatformWin.cmake:
* WebKitTestRunner/PlatformWPE.cmake:
Modified Paths
Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (260533 => 260534)
--- trunk/Source/WebCore/CMakeLists.txt 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Source/WebCore/CMakeLists.txt 2020-04-22 22:16:31 UTC (rev 260534)
@@ -1261,9 +1261,6 @@
WebKit::_javascript_Core
WebKit::PAL
)
-if (NOT WTF_OS_WINDOWS)
- list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
-endif ()
if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
list(APPEND WebCore_SOURCES
@@ -1704,7 +1701,13 @@
set(WebCore_INTERFACE_LIBRARIES WebCore)
set(WebCore_INTERFACE_INCLUDE_DIRECTORIES ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR})
+set(WebCoreTestSupport_INTERFACE_LIBRARIES WebCoreTestSupport)
+set(WebCoreTestSupport_INTERFACE_INCLUDE_DIRECTORIES
+ ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCoreTestSupport
+)
+
WEBKIT_FRAMEWORK_DECLARE(WebCore)
+WEBKIT_FRAMEWORK_DECLARE(WebCoreTestSupport)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
# Generate CommandLineAPIModuleSource.h
@@ -2045,21 +2048,27 @@
WEBKIT_ADD_PRECOMPILED_HEADER("WebCoreTestSupportPrefix.h" "testing/js/WebCoreTestSupportPrefix.cpp" WebCoreTestSupport_SOURCES)
endif ()
-add_library(WebCoreTestSupport ${WebCoreTestSupport_LIBRARY_TYPE} ${WebCoreTestSupport_SOURCES})
-add_dependencies(WebCoreTestSupport WebCore WebCoreTestSupportBindings)
-target_compile_definitions(WebCoreTestSupport PRIVATE "BUILDING_WebCoreTestSupport")
-target_include_directories(WebCoreTestSupport PUBLIC ${WebCoreTestSupport_INCLUDE_DIRECTORIES} ${WebCore_INCLUDE_DIRECTORIES})
-target_include_directories(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES} ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
-target_include_directories(WebCoreTestSupport SYSTEM PUBLIC ${WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES} ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
-target_link_libraries(WebCoreTestSupport PRIVATE ${WebCoreTestSupport_LIBRARIES})
+WEBKIT_COPY_FILES(Copy_WebCoreTestSupportPrivateHeaders
+ DESTINATION ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/WebCoreTestSupport
+ FILES testing/js/WebCoreTestSupport.h
+ FLATTENED
+)
+list(APPEND WebCoreTestSupport_INTERFACE_DEPENDENCIES Copy_WebCoreTestSupportPrivateHeaders)
-if (WebCoreTestSupport_OUTPUT_NAME)
- set_target_properties(WebCoreTestSupport PROPERTIES OUTPUT_NAME ${WebCoreTestSupport_OUTPUT_NAME})
- if (MSVC)
- add_compile_options(/WX-)
- endif ()
+list(APPEND WebCoreTestSupport_INCLUDE_DIRECTORIES ${WebCore_INCLUDE_DIRECTORIES})
+list(APPEND WebCoreTestSupport_PRIVATE_INCLUDE_DIRECTORIES ${WebCore_PRIVATE_INCLUDE_DIRECTORIES})
+list(APPEND WebCoreTestSupport_SYSTEM_INCLUDE_DIRECTORIES ${WebCore_SYSTEM_INCLUDE_DIRECTORIES})
+
+if (WebCore_LIBRARY_TYPE STREQUAL SHARED)
+ list(APPEND WebCoreTestSupport_LIBRARIES WebCore)
+else ()
+ list(APPEND WebCoreTestSupport_LIBRARIES ${WebCore_LIBRARIES})
+ list(APPEND WebCoreTestSupport_PRIVATE_LIBRARIES ${WebCore_PRIVATE_LIBRARIES})
endif ()
+WEBKIT_FRAMEWORK(WebCoreTestSupport)
+WEBKIT_FRAMEWORK_TARGET(WebCoreTestSupport)
+
if (${WebCore_LIBRARY_TYPE} MATCHES "SHARED")
set_target_properties(WebCore PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
install(TARGETS WebCore DESTINATION "${LIB_INSTALL_DIR}")
Modified: trunk/Source/WebCore/ChangeLog (260533 => 260534)
--- trunk/Source/WebCore/ChangeLog 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Source/WebCore/ChangeLog 2020-04-22 22:16:31 UTC (rev 260534)
@@ -1,3 +1,15 @@
+2020-04-22 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCoreTestSupport target
+ https://bugs.webkit.org/show_bug.cgi?id=210867
+
+ Reviewed by Michael Catanzaro.
+
+ Add the WebKit::WebCoreTestSupport target. Modify WebCoreTestSupport to only
+ have a dependency on WebCore if WebCore is built as a shared library.
+
+ * CMakeLists.txt:
+
2020-04-22 Eric Carlson <[email protected]>
fast/events/event-handler-detached-document-dispatchEvent.html is crashing
Modified: trunk/Tools/ChangeLog (260533 => 260534)
--- trunk/Tools/ChangeLog 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Tools/ChangeLog 2020-04-22 22:16:31 UTC (rev 260534)
@@ -1,3 +1,17 @@
+2020-04-22 Don Olmstead <[email protected]>
+
+ [CMake] Add WebKit::WebCoreTestSupport target
+ https://bugs.webkit.org/show_bug.cgi?id=210867
+
+ Reviewed by Michael Catanzaro.
+
+ Use the WebKit::WebCoreTestSupport target in DumpRenderTree. Fix an
+ include for WPE in WebKitTestRunner.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * WebKitTestRunner/PlatformWPE.cmake:
+
2020-04-22 Sihui Liu <[email protected]>
TextManipulation.CompleteTextManipulationAvoidCrashingWhenContentIsRemoved does not wait for result
Modified: trunk/Tools/DumpRenderTree/CMakeLists.txt (260533 => 260534)
--- trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Tools/DumpRenderTree/CMakeLists.txt 2020-04-22 22:16:31 UTC (rev 260534)
@@ -25,7 +25,7 @@
)
set(DumpRenderTree_LIBRARIES
- WebCoreTestSupport
+ WebKit::WebCoreTestSupport
WebKit::_javascript_Core
)
@@ -38,10 +38,6 @@
)
list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
- ${WEBCORE_DIR}/testing/js
-)
-
-list(APPEND DumpRenderTree_PRIVATE_INCLUDE_DIRECTORIES
${PAL_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
Modified: trunk/Tools/DumpRenderTree/PlatformWin.cmake (260533 => 260534)
--- trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Tools/DumpRenderTree/PlatformWin.cmake 2020-04-22 22:16:31 UTC (rev 260534)
@@ -42,6 +42,7 @@
${DumpRenderTree_DIR}/cairo
)
list(APPEND DumpRenderTree_LIBRARIES
+ $<TARGET_OBJECTS:WebCoreTestSupport>
Cairo::Cairo
)
list(APPEND DumpRenderTree_SOURCES
Modified: trunk/Tools/WebKitTestRunner/PlatformWPE.cmake (260533 => 260534)
--- trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2020-04-22 21:56:02 UTC (rev 260533)
+++ trunk/Tools/WebKitTestRunner/PlatformWPE.cmake 2020-04-22 22:16:31 UTC (rev 260534)
@@ -21,6 +21,7 @@
)
list(APPEND WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
+ ${ATK_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
${LIBXKBCOMMON_INCLUDE_DIRS}
${WPEBACKEND_FDO_INCLUDE_DIRS}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
