Title: [188643] trunk
- Revision
- 188643
- Author
- commit-qu...@webkit.org
- Date
- 2015-08-19 11:37:02 -0700 (Wed, 19 Aug 2015)
Log Message
Build TestWTF on Mac with CMake.
https://bugs.webkit.org/show_bug.cgi?id=147972
Patch by Alex Christensen <achristen...@webkit.org> on 2015-08-19
Reviewed by Tim Horton.
.:
* Source/cmake/OptionsMac.cmake:
Enable API tests in Mac's CMake build.
Source/WebKit2:
* PlatformMac.cmake:
Make more forwarding headers.
Tools:
TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.
* TestWebKitAPI/CMakeLists.txt:
Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.
* TestWebKitAPI/PlatformMac.cmake: Added.
* TestWebKitAPI/config.h:
Postpone some build fixes until WebKit builds completely on Mac with CMake.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (188642 => 188643)
--- trunk/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
@@ -1,3 +1,13 @@
+2015-08-19 Alex Christensen <achristen...@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ * Source/cmake/OptionsMac.cmake:
+ Enable API tests in Mac's CMake build.
+
2015-08-18 Alex Christensen <achristen...@webkit.org>
[CMake] REGRESSION(r188540): WebKitTestRunner is not longer built and all the tests (layout and perf) fail.
Modified: trunk/Source/WebKit2/ChangeLog (188642 => 188643)
--- trunk/Source/WebKit2/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/WebKit2/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
@@ -1,3 +1,13 @@
+2015-08-19 Alex Christensen <achristen...@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ * PlatformMac.cmake:
+ Make more forwarding headers.
+
2015-08-18 Filip Pizlo <fpi...@apple.com>
Replace all uses of std::mutex/std::condition_variable with WTF::Lock/WTF::Condition
Modified: trunk/Source/WebKit2/PlatformMac.cmake (188642 => 188643)
--- trunk/Source/WebKit2/PlatformMac.cmake 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/WebKit2/PlatformMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
@@ -58,6 +58,7 @@
UIProcess/Cocoa
UIProcess/API/C
+ UIProcess/API/Cocoa
WebProcess/WebPage
Modified: trunk/Source/cmake/OptionsMac.cmake (188642 => 188643)
--- trunk/Source/cmake/OptionsMac.cmake 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Source/cmake/OptionsMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
@@ -4,6 +4,7 @@
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphoneos PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_ACCELERATED_OVERFLOW_SCROLLING_iphonesimulator PRIVATE ON)
+WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_API_TESTS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx PRIVATE ON)
WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_AVF_CAPTIONS_macosx_1080 PRIVATE OFF)
Modified: trunk/Tools/ChangeLog (188642 => 188643)
--- trunk/Tools/ChangeLog 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/ChangeLog 2015-08-19 18:37:02 UTC (rev 188643)
@@ -1,3 +1,20 @@
+2015-08-19 Alex Christensen <achristen...@webkit.org>
+
+ Build TestWTF on Mac with CMake.
+ https://bugs.webkit.org/show_bug.cgi?id=147972
+
+ Reviewed by Tim Horton.
+
+ TestWTF only depends on gtest and WTF instead of TestWebKitAPi depending on all of WebKit.
+ Now I can run the WTF API tests after a few seconds of building instead of waiting for all of WebKit to build.
+
+ * TestWebKitAPI/CMakeLists.txt:
+ Added WTF as a dependency for platforms that do not have ForwardingHeadersForTestWebKitAPI_NAME.
+ WTF was already a library that was linked, but having at least one item makes the syntax of add_dependencies work.
+ * TestWebKitAPI/PlatformMac.cmake: Added.
+ * TestWebKitAPI/config.h:
+ Postpone some build fixes until WebKit builds completely on Mac with CMake.
+
2015-08-19 Brian Burg <bb...@apple.com>
Unreviewed, add Aleksandr Skachkov to the list of contributors.
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (188642 => 188643)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2015-08-19 18:37:02 UTC (rev 188643)
@@ -141,7 +141,7 @@
)
target_link_libraries(TestWebKitAPIInjectedBundle ${TestWebKitAPI_LIBRARIES})
- add_dependencies(TestWebKitAPIInjectedBundle ${ForwardingHeadersForTestWebKitAPI_NAME})
+ add_dependencies(TestWebKitAPIInjectedBundle WTF ${ForwardingHeadersForTestWebKitAPI_NAME})
get_property(TestWebKitAPIInjectedBundle_PATH TARGET TestWebKitAPIInjectedBundle PROPERTY LOCATION)
endif ()
Added: trunk/Tools/TestWebKitAPI/PlatformMac.cmake (0 => 188643)
--- trunk/Tools/TestWebKitAPI/PlatformMac.cmake (rev 0)
+++ trunk/Tools/TestWebKitAPI/PlatformMac.cmake 2015-08-19 18:37:02 UTC (rev 188643)
@@ -0,0 +1,21 @@
+set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+set(TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY_WTF "${TESTWEBKITAPI_RUNTIME_OUTPUT_DIRECTORY}")
+
+include_directories(
+ ${DERIVED_SOURCES_DIR}/ForwardingHeaders
+ "${WTF_DIR}/icu"
+)
+
+set(test_main_SOURCES
+ ${TESTWEBKITAPI_DIR}/mac/mainMac.mm
+)
+
+find_library(CARBON_LIBRARY Carbon)
+find_library(COCOA_LIBRARY Cocoa)
+find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+list(APPEND test_wtf_LIBRARIES
+ ${CARBON_LIBRARY}
+ ${COCOA_LIBRARY}
+ ${COREFOUNDATION_LIBRARY}
+ libicucore.dylib
+)
Modified: trunk/Tools/TestWebKitAPI/config.h (188642 => 188643)
--- trunk/Tools/TestWebKitAPI/config.h 2015-08-19 18:18:19 UTC (rev 188642)
+++ trunk/Tools/TestWebKitAPI/config.h 2015-08-19 18:37:02 UTC (rev 188643)
@@ -83,8 +83,11 @@
#endif
#if PLATFORM(COCOA) && defined(__OBJC__)
+// FIXME: Get Cocoa tests working with CMake on Mac.
+#if !defined(BUILDING_WITH_CMAKE)
#import <WebKit/WebKit.h>
#endif
+#endif
#if !PLATFORM(IOS)
#define WK_HAVE_C_SPI 1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
