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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@222131 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Author: [email protected]

Source/WebKit/ChangeLog

@@ -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

Source/WebKit/PlatformMac.cmake

@@ -543,6 +543,7 @@ set(WebKitLegacyForwardingHeaders
     WebCoreStatistics.h
     WebDOMOperations.h
     WebDOMOperationsPrivate.h
+    WebDatabaseManagerPrivate.h
     WebDataSource.h
     WebDataSourcePrivate.h
     WebDefaultPolicyDelegate.h
@@ -578,6 +579,7 @@ set(WebKitLegacyForwardingHeaders
     WebQuotaManager.h
     WebScriptWorld.h
     WebSecurityOriginPrivate.h
+    WebStorageManagerPrivate.h
     WebTypesInternal.h
     WebUIDelegate.h
     WebUIDelegatePrivate.h
@@ -739,8 +741,6 @@ list(APPEND WebKit2_AUTOMATION_PROTOCOL_GENERATOR_EXTRA_FLAGS
 
 # 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}")
 

Source/WebKitLegacy/ChangeLog

@@ -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.

Source/WebKitLegacy/PlatformMac.cmake

@@ -325,6 +325,7 @@ set(WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES
     mac/Misc
     mac/Panels
     mac/Plugins
+    mac/Storage
     mac/WebCoreSupport
     mac/WebInspector
     mac/WebView
@@ -342,6 +343,8 @@ set(WebKitLegacy_FORWARDING_HEADERS_FILES
 
     mac/Plugins/WebBasePluginPackage.h
 
+    mac/Storage/WebDatabaseManagerPrivate.h
+
     mac/WebCoreSupport/WebKeyGenerator.h
 
     mac/WebInspector/WebInspector.h

Tools/ChangeLog

@@ -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

Tools/TestWebKitAPI/CMakeLists.txt

@@ -205,6 +205,12 @@ if (COMPILER_IS_GCC_OR_CLANG)
                                         -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}