[Webkit-unassigned] [Bug 167343] webkit-gtk-2.15.3 fails to build on macOS due to missing declaration of U8_MAX_LENGTH

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Thu Apr 20 12:36:36 PDT 2017


https://bugs.webkit.org/show_bug.cgi?id=167343

--- Comment #13 from Konstantin Tokarev <annulen at yandex.ru> ---
I'm really sorry, here is a complete patch:

diff --git a/Source/WTF/wtf/CMakeLists.txt b/Source/WTF/wtf/CMakeLists.txt
index 1bae3bb90b3..7d902484fcd 100644
--- a/Source/WTF/wtf/CMakeLists.txt
+++ b/Source/WTF/wtf/CMakeLists.txt
@@ -286,6 +286,12 @@ set(WTF_SOURCES
 set(WTF_INCLUDE_DIRECTORIES
     "${BMALLOC_DIR}"
     "${WTF_DIR}"
+    "${THIRDPARTY_DIR}"
+    "${CMAKE_BINARY_DIR}"
+    "${DERIVED_SOURCES_DIR}"
+)
+
+set(WTF_PRIVATE_INCLUDE_DIRECTORIES
     "${WTF_DIR}/wtf"
     "${WTF_DIR}/wtf/dtoa"
     "${WTF_DIR}/wtf/persistence"
@@ -293,9 +299,6 @@ set(WTF_INCLUDE_DIRECTORIES
     "${WTF_DIR}/wtf/text/icu"
     "${WTF_DIR}/wtf/threads"
     "${WTF_DIR}/wtf/unicode"
-    "${THIRDPARTY_DIR}"
-    "${CMAKE_BINARY_DIR}"
-    "${DERIVED_SOURCES_DIR}"
 )

 set(WTF_LIBRARIES
diff --git a/Source/cmake/WebKitMacros.cmake b/Source/cmake/WebKitMacros.cmake
index a793ce40683..a0e81ee50dd 100644
--- a/Source/cmake/WebKitMacros.cmake
+++ b/Source/cmake/WebKitMacros.cmake
@@ -283,6 +283,7 @@ macro(WEBKIT_FRAMEWORK _target)
         ${${_target}_SOURCES}
     )
     target_include_directories(${_target} PUBLIC "$<BUILD_INTERFACE:${${_target}_INCLUDE_DIRECTORIES}>")
+    target_include_directories(${_target} PRIVATE "$<BUILD_INTERFACE:${${_target}_PRIVATE_INCLUDE_DIRECTORIES}>")
     target_link_libraries(${_target} ${${_target}_LIBRARIES})
     set_target_properties(${_target} PROPERTIES COMPILE_DEFINITIONS "BUILDING_${_target}")

@@ -332,7 +333,7 @@ macro(WEBKIT_CREATE_FORWARDING_HEADERS _framework)
     if (NOT WIN32)
         set(_processing_directories 0)
         set(_processing_files 0)
-        set(_target_directory "${DERIVED_SOURCES_DIR}/ForwardingHeaders/${_framework}")
+        set(_target_directory "${FORWARDING_HEADERS_DIR}/${_framework}")

         file(GLOB _files "${_target_directory}/*.h")
         foreach (_file ${_files})

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20170420/b4285e6a/attachment-0001.html>


More information about the webkit-unassigned mailing list