Title: [222131] trunk
- Revision
- 222131
- Author
- [email protected]
- Date
- 2017-09-16 11:46:44 -0700 (Sat, 16 Sep 2017)
Log Message
Fix the Tools build with CMake on macOS
https://bugs.webkit.org/show_bug.cgi?id=177030
Reviewed by Geoffrey Garen.
Source/WebKit:
* PlatformMac.cmake:
Add some WebKitLegacy headers to forward (for use by the tools).
Source/WebKitLegacy:
* PlatformMac.cmake:
Add some forwarding headers.
Tools:
* TestWebKitAPI/CMakeLists.txt:
Add a workaround identical to what the gtest CMakeLists has.
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (222130 => 222131)
--- trunk/Source/WebKit/ChangeLog 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Source/WebKit/ChangeLog 2017-09-16 18:46:44 UTC (rev 222131)
@@ -1,3 +1,13 @@
+2017-09-16 Tim Horton <[email protected]>
+
+ Fix the Tools build with CMake on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=177030
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformMac.cmake:
+ Add some WebKitLegacy headers to forward (for use by the tools).
+
2017-09-15 JF Bastien <[email protected]>
WTF: use Forward.h when appropriate instead of Vector.h
Modified: trunk/Source/WebKit/PlatformMac.cmake (222130 => 222131)
--- trunk/Source/WebKit/PlatformMac.cmake 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Source/WebKit/PlatformMac.cmake 2017-09-16 18:46:44 UTC (rev 222131)
@@ -543,6 +543,7 @@
WebCoreStatistics.h
WebDOMOperations.h
WebDOMOperationsPrivate.h
+ WebDatabaseManagerPrivate.h
WebDataSource.h
WebDataSourcePrivate.h
WebDefaultPolicyDelegate.h
@@ -578,6 +579,7 @@
WebQuotaManager.h
WebScriptWorld.h
WebSecurityOriginPrivate.h
+ WebStorageManagerPrivate.h
WebTypesInternal.h
WebUIDelegate.h
WebUIDelegatePrivate.h
@@ -739,8 +741,6 @@
# FIXME: These should not be necessary.
file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WKImageCG.h "#import <WebKit/Shared/API/c/cg/WKImageCG.h>")
-file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebStorageManagerPrivate.h "#import <WebKit/mac/Storage/WebStorageManagerPrivate.h>")
-file(WRITE ${FORWARDING_HEADERS_DIR}/WebKit/WebDatabaseManagerPrivate.h "#import <WebKit/mac/Storage/WebDatabaseManagerPrivate.h>")
set(CMAKE_SHARED_LINKER_FLAGS ${CMAKE_SHARED_LINKER_FLAGS} "-compatibility_version 1 -current_version ${WEBKIT_MAC_VERSION}")
Modified: trunk/Source/WebKitLegacy/ChangeLog (222130 => 222131)
--- trunk/Source/WebKitLegacy/ChangeLog 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Source/WebKitLegacy/ChangeLog 2017-09-16 18:46:44 UTC (rev 222131)
@@ -1,3 +1,13 @@
+2017-09-16 Tim Horton <[email protected]>
+
+ Fix the Tools build with CMake on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=177030
+
+ Reviewed by Geoffrey Garen.
+
+ * PlatformMac.cmake:
+ Add some forwarding headers.
+
2017-09-12 Per Arne Vollan <[email protected]>
[Win] Link errors when building WebKit from .proj files.
Modified: trunk/Source/WebKitLegacy/PlatformMac.cmake (222130 => 222131)
--- trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Source/WebKitLegacy/PlatformMac.cmake 2017-09-16 18:46:44 UTC (rev 222131)
@@ -325,6 +325,7 @@
mac/Misc
mac/Panels
mac/Plugins
+ mac/Storage
mac/WebCoreSupport
mac/WebInspector
mac/WebView
@@ -342,6 +343,8 @@
mac/Plugins/WebBasePluginPackage.h
+ mac/Storage/WebDatabaseManagerPrivate.h
+
mac/WebCoreSupport/WebKeyGenerator.h
mac/WebInspector/WebInspector.h
Modified: trunk/Tools/ChangeLog (222130 => 222131)
--- trunk/Tools/ChangeLog 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Tools/ChangeLog 2017-09-16 18:46:44 UTC (rev 222131)
@@ -1,3 +1,13 @@
+2017-09-16 Tim Horton <[email protected]>
+
+ Fix the Tools build with CMake on macOS
+ https://bugs.webkit.org/show_bug.cgi?id=177030
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/CMakeLists.txt:
+ Add a workaround identical to what the gtest CMakeLists has.
+
2017-09-16 Carlos Garcia Campos <[email protected]>
[GTK] Bump fontconfig version to 2.12.4
Modified: trunk/Tools/TestWebKitAPI/CMakeLists.txt (222130 => 222131)
--- trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-09-16 15:01:53 UTC (rev 222130)
+++ trunk/Tools/TestWebKitAPI/CMakeLists.txt 2017-09-16 18:46:44 UTC (rev 222131)
@@ -205,6 +205,12 @@
-Wno-unused-parameter)
endif ()
+# FIXME: This works around compatibility problems in the old version of the third-pary
+# googletest source code checkout. It should be removed once we upgrade to a newer version.
+if (COMPILER_IS_CLANG)
+ add_definitions(-DGTEST_HAS_TR1_TUPLE=0)
+endif ()
+
if (ENABLE_WEBKIT)
add_library(TestWebKitAPIBase
${test_main_SOURCES}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
