Diff
Modified: branches/safari-608-branch/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -8,7 +8,7 @@
# and loading the cross-compilation settings from CMAKE_TOOLCHAIN_FILE.
#
-cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.7)
project(WebKit)
Modified: branches/safari-608-branch/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,23 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * Source/cmake/FindICU.cmake: Added.
+ * Source/cmake/OptionsAppleWin.cmake:
+ * Source/cmake/OptionsGTK.cmake:
+ * Source/cmake/OptionsPlayStation.cmake:
+ * Source/cmake/OptionsWPE.cmake:
+ * Source/cmake/OptionsWin.cmake:
+ * Source/cmake/OptionsWinCairo.cmake:
+
2019-07-11 Pablo Saavedra <psaave...@igalia.com>
[WPE][GTK] Build failure with ENABLE_ACCESSIBILITY=OFF
Modified: branches/safari-608-branch/Source/_javascript_Core/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/_javascript_Core/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/_javascript_Core/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -7,6 +7,7 @@
)
set(_javascript_Core_INCLUDE_DIRECTORIES
+ "${WTF_FRAMEWORK_HEADERS_DIR}"
"${_javascript_Core_FRAMEWORK_HEADERS_DIR}"
)
@@ -53,6 +54,10 @@
list(APPEND _javascript_Core_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/capstone/Source/include")
endif ()
+set(_javascript_Core_SYSTEM_INCLUDE_DIRECTORIES
+ "${ICU_INCLUDE_DIRS}"
+)
+
set(_javascript_Core_OBJECT_LUT_SOURCES
runtime/ArrayConstructor.cpp
runtime/AsyncFromSyncIteratorPrototype.cpp
@@ -116,7 +121,8 @@
)
set(_javascript_Core_LIBRARIES
- WebKit::WTF
+ WTF${DEBUG_SUFFIX}
+ ${ICU_I18N_LIBRARIES}
)
if (USE_CAPSTONE)
@@ -290,10 +296,10 @@
${_javascript_Core_DERIVED_SOURCES_DIR}/LLIntDesiredOffsets.h ${_javascript_Core_DERIVED_SOURCES_DIR}/Bytecodes.h ${_javascript_Core_DERIVED_SOURCES_DIR}/BytecodeStructs.h
)
-target_link_libraries(LLIntSettingsExtractor WebKit::WTF)
-add_dependencies(LLIntSettingsExtractor _javascript_Core_CopyHeaders)
-target_link_libraries(LLIntOffsetsExtractor WebKit::WTF)
-add_dependencies(LLIntOffsetsExtractor _javascript_Core_CopyHeaders)
+target_link_libraries(LLIntSettingsExtractor WTF)
+add_dependencies(LLIntSettingsExtractor _javascript_CoreFrameworkHeaders)
+target_link_libraries(LLIntOffsetsExtractor WTF)
+add_dependencies(LLIntOffsetsExtractor _javascript_CoreFrameworkHeaders)
# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
# LLIntAssembly.h's mtime. The problem we have here is: asm.rb has some built-in optimization
@@ -1273,16 +1279,6 @@
endif ()
endif ()
-set(_javascript_Core_INTERFACE_LIBRARIES _javascript_Core)
-set(_javascript_Core_INTERFACE_INCLUDE_DIRECTORIES
- ${_javascript_Core_FRAMEWORK_HEADERS_DIR}
- ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
-)
-set(_javascript_Core_INTERFACE_DEPENDENCIES
- _javascript_Core_CopyHeaders
- _javascript_Core_CopyPrivateHeaders
-)
-
WEBKIT_FRAMEWORK_DECLARE(_javascript_Core)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
@@ -1292,22 +1288,19 @@
WEBKIT_ADD_TARGET_CXX_FLAGS(_javascript_Core -ffp-contract=off)
endif ()
-WEBKIT_COPY_FILES(_javascript_Core_CopyHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(_javascript_Core
+ TARGET_NAME _javascript_CoreFrameworkHeaders
DESTINATION ${_javascript_Core_FRAMEWORK_HEADERS_DIR}/_javascript_Core
FILES ${_javascript_Core_PUBLIC_FRAMEWORK_HEADERS}
FLATTENED
)
-WEBKIT_COPY_FILES(_javascript_Core_CopyPrivateHeaders
+WEBKIT_MAKE_FORWARDING_HEADERS(_javascript_Core
+ TARGET_NAME _javascript_CorePrivateFrameworkHeaders
DESTINATION ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}/_javascript_Core
FILES ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS}
FLATTENED
)
-# _javascript_Core_CopyPrivateHeaders needs to have a direct or indirect
-# dependency of _javascript_Core for CMake Visual Studio generator to
-# eliminate duplicated custom commands. Otherwise,
-# CombinedDomains.json will be generated in both projects.
-add_dependencies(_javascript_Core_CopyPrivateHeaders _javascript_Core)
target_include_directories(LLIntSettingsExtractor PRIVATE
${_javascript_Core_INCLUDE_DIRECTORIES}
@@ -1326,7 +1319,6 @@
WEBKIT_COMPUTE_SOURCES(_javascript_Core)
WEBKIT_WRAP_SOURCELIST(${_javascript_Core_SOURCES})
WEBKIT_FRAMEWORK(_javascript_Core)
-WEBKIT_FRAMEWORK_TARGET(_javascript_Core)
if (NOT "${PORT}" STREQUAL "Mac")
if (${_javascript_Core_LIBRARY_TYPE} STREQUAL "SHARED")
Modified: branches/safari-608-branch/Source/_javascript_Core/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/_javascript_Core/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/_javascript_Core/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,18 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ * shell/CMakeLists.txt:
+
2019-07-29 Alan Coon <alanc...@apple.com>
Cherry-pick r247714. rdar://problem/53647616
Modified: branches/safari-608-branch/Source/_javascript_Core/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/_javascript_Core/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/_javascript_Core/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -27,6 +27,7 @@
if (NOT WTF_PLATFORM_WIN_CAIRO)
list(APPEND _javascript_Core_LIBRARIES
+ ${ICU_LIBRARIES}
winmm
)
endif ()
Modified: branches/safari-608-branch/Source/_javascript_Core/shell/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/_javascript_Core/shell/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/_javascript_Core/shell/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -8,12 +8,14 @@
set(jsc_LIBRARIES
${CMAKE_DL_LIBS}
- WebKit::_javascript_Core
+ _javascript_Core${DEBUG_SUFFIX}
+ WTF${DEBUG_SUFFIX}
)
set(jsc_PRIVATE_INCLUDE_DIRECTORIES
${_javascript_Core_INCLUDE_DIRECTORIES}
${_javascript_Core_PRIVATE_INCLUDE_DIRECTORIES}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
${_javascript_Core_SYSTEM_INCLUDE_DIRECTORIES}
)
@@ -21,6 +23,10 @@
list(APPEND jsc_LIBRARIES edit)
endif ()
+if (WIN32)
+ list(APPEND jsc_LIBRARIES Winmm)
+endif ()
+
WEBKIT_EXECUTABLE_DECLARE(jsc)
if (DEVELOPER_MODE)
@@ -40,32 +46,32 @@
)
set(testapi_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testapi_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testapi_LIBRARIES WebKit::_javascript_Core)
+ set(testapi_LIBRARIES _javascript_Core)
set(testmasm_SOURCES ../assembler/testmasm.cpp)
set(testmasm_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testmasm_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testmasm_LIBRARIES WebKit::_javascript_Core)
+ set(testmasm_LIBRARIES _javascript_Core)
set(testRegExp_SOURCES ../testRegExp.cpp)
set(testRegExp_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testRegExp_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testRegExp_LIBRARIES WebKit::_javascript_Core)
+ set(testRegExp_LIBRARIES _javascript_Core)
set(testb3_SOURCES ../b3/testb3.cpp)
set(testb3_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testb3_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testb3_LIBRARIES WebKit::_javascript_Core)
+ set(testb3_LIBRARIES _javascript_Core)
set(testair_SOURCES ../b3/air/testair.cpp)
set(testair_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testair_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testair_LIBRARIES WebKit::_javascript_Core)
+ set(testair_LIBRARIES _javascript_Core)
set(testdfg_SOURCES ../dfg/testdfg.cpp)
set(testdfg_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
set(testdfg_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
- set(testdfg_LIBRARIES WebKit::_javascript_Core)
+ set(testdfg_LIBRARIES _javascript_Core)
WEBKIT_EXECUTABLE_DECLARE(testapi)
WEBKIT_EXECUTABLE_DECLARE(testRegExp)
Modified: branches/safari-608-branch/Source/WTF/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WTF/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WTF/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,17 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * wtf/CMakeLists.txt:
+ * wtf/PlatformPlayStation.cmake:
+
2019-07-31 Alan Coon <alanc...@apple.com>
Cherry-pick r248071. rdar://problem/53789003
Modified: branches/safari-608-branch/Source/WTF/wtf/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WTF/wtf/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WTF/wtf/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -454,10 +454,7 @@
threads/BinarySemaphore.cpp
threads/Signals.cpp
- unicode/CollatorDefault.cpp
unicode/UTF8Conversion.cpp
-
- unicode/icu/CollatorICU.cpp
)
set(WTF_INCLUDE_DIRECTORIES
@@ -488,28 +485,32 @@
list(APPEND WTF_LIBRARIES WebKit::bmalloc)
endif ()
+list(APPEND WTF_SOURCES
+ unicode/CollatorDefault.cpp
+
+ unicode/icu/CollatorICU.cpp
+)
+set(WTF_SYSTEM_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
list(APPEND WTF_LIBRARIES
- ICU::data
- ICU::i18n
- ICU::uc
+ ${ICU_DATA_LIBRARIES}
+ ${ICU_I18N_LIBRARIES}
+ ${ICU_LIBRARIES}
)
-set(WTF_INTERFACE_LIBRARIES WTF)
-set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR})
-set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
-
WEBKIT_FRAMEWORK_DECLARE(WTF)
WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
-WEBKIT_COPY_FILES(WTF_CopyHeaders
+WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
+WEBKIT_FRAMEWORK(WTF)
+
+WEBKIT_MAKE_FORWARDING_HEADERS(WTF
+ TARGET_NAME WTFFrameworkHeaders
DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
FILES ${WTF_PUBLIC_HEADERS}
)
-WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
-WEBKIT_FRAMEWORK(WTF)
-WEBKIT_FRAMEWORK_TARGET(WTF)
-
if (MSVC)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS")
Modified: branches/safari-608-branch/Source/WTF/wtf/PlatformPlayStation.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WTF/wtf/PlatformPlayStation.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WTF/wtf/PlatformPlayStation.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -20,6 +20,7 @@
list(APPEND WTF_LIBRARIES
${CMAKE_THREAD_LIBS_INIT}
+ ${ICU_LIBRARIES}
${C_STD_LIBRARY}
${KERNEL_LIBRARY}
Modified: branches/safari-608-branch/Source/WebCore/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -17,6 +17,7 @@
)
set(WebCore_INCLUDE_DIRECTORIES
+ "${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}"
"${PAL_FRAMEWORK_HEADERS_DIR}"
)
@@ -167,6 +168,7 @@
)
set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${LIBXSLT_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
@@ -1198,6 +1200,7 @@
)
set(WebCore_LIBRARIES
+ ${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${LIBXSLT_LIBRARIES}
${SQLITE_LIBRARIES}
@@ -1206,7 +1209,7 @@
)
set(WebCoreTestSupport_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core${DEBUG_SUFFIX}
)
if (ENABLE_LEGACY_ENCRYPTED_MEDIA)
Modified: branches/safari-608-branch/Source/WebCore/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,19 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformPlayStation.cmake:
+ * PlatformWPE.cmake:
+ * PlatformWin.cmake:
+
2019-08-01 Alan Coon <alanc...@apple.com>
Apply patch. rdar://problem/53764238
Modified: branches/safari-608-branch/Source/WebCore/PAL/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/PAL/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/PAL/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,16 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * pal/CMakeLists.txt:
+
2019-07-31 Alan Coon <alanc...@apple.com>
Cherry-pick r248071. rdar://problem/53789003
Modified: branches/safari-608-branch/Source/WebCore/PAL/pal/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/PAL/pal/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/PAL/pal/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -37,8 +37,12 @@
"${PAL_DIR}/pal/text"
)
+set(PAL_SYSTEM_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+
set(PAL_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core${DEBUG_SUFFIX}
)
WEBKIT_FRAMEWORK_DECLARE(PAL)
Modified: branches/safari-608-branch/Source/WebCore/PlatformPlayStation.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/PlatformPlayStation.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/PlatformPlayStation.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -81,6 +81,7 @@
)
list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
${LIBXML2_INCLUDE_DIR}
${SQLITE_INCLUDE_DIR}
${ZLIB_INCLUDE_DIRS}
@@ -88,6 +89,7 @@
)
list(APPEND WebCore_LIBRARIES
+ ${ICU_LIBRARIES}
${LIBXML2_LIBRARIES}
${SQLITE_LIBRARIES}
${ZLIB_LIBRARIES}
Modified: branches/safari-608-branch/Source/WebCore/PlatformWPE.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/PlatformWPE.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/PlatformWPE.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -54,6 +54,7 @@
${GLIB_GMODULE_LIBRARIES}
${GLIB_GOBJECT_LIBRARIES}
${GLIB_LIBRARIES}
+ ${ICU_LIBRARIES}
${LIBTASN1_LIBRARIES}
${UPOWERGLIB_LIBRARIES}
${WPE_LIBRARIES}
@@ -63,6 +64,7 @@
${ATK_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
${GLIB_INCLUDE_DIRS}
+ ${ICU_INCLUDE_DIRS}
${LIBTASN1_INCLUDE_DIRS}
${UPOWERGLIB_INCLUDE_DIRS}
${WPE_INCLUDE_DIRS}
Modified: branches/safari-608-branch/Source/WebCore/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WebCore/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebCore/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -236,4 +236,9 @@
)
endif ()
-set(WebCore_OUTPUT_NAME WebCore${DEBUG_SUFFIX})
+set(WebCore_OUTPUT_NAME
+ WebCore${DEBUG_SUFFIX}
+)
+
+list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
+list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})
Modified: branches/safari-608-branch/Source/WebDriver/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebDriver/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebDriver/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -6,6 +6,7 @@
"${CMAKE_BINARY_DIR}"
"${WEBDRIVER_DIR}"
"${DERIVED_SOURCES_WEBDRIVER_DIR}"
+ "${WTF_FRAMEWORK_HEADERS_DIR}"
)
set(WebDriver_SOURCES
@@ -18,7 +19,7 @@
)
set(WebDriver_LIBRARIES
- WebKit::WTF
+ WTF
)
set(WebDriver_SCRIPTS
Modified: branches/safari-608-branch/Source/WebDriver/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebDriver/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebDriver/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,17 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWPE.cmake:
+
2019-06-03 Carlos Garcia Campos <cgar...@igalia.com>
REGRESSION(r245567): [GTK][WPE] [2.25.1] WebKitWebDriver gets installed as WebDriver
Modified: branches/safari-608-branch/Source/WebDriver/PlatformWPE.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WebDriver/PlatformWPE.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebDriver/PlatformWPE.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -2,6 +2,7 @@
list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
"${GLIB_INCLUDE_DIRS}"
+ "${ICU_INCLUDE_DIRS}"
"${LIBSOUP_INCLUDE_DIRS}"
)
Modified: branches/safari-608-branch/Source/WebKit/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebKit/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKit/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -98,6 +98,10 @@
set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${_javascript_CORE_DIR}/inspector/scripts")
+set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+
list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
"Sources.txt"
)
Modified: branches/safari-608-branch/Source/WebKit/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKit/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,16 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+
2019-08-01 Alan Coon <alanc...@apple.com>
Cherry-pick r248085. rdar://problem/53825741
Modified: branches/safari-608-branch/Source/WebKitLegacy/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -25,8 +25,12 @@
"${WebKitLegacy_DERIVED_SOURCES_DIR}"
)
+set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
+ "${ICU_INCLUDE_DIRS}"
+)
+
set(WebKitLegacy_LIBRARIES
- PRIVATE WebKit::_javascript_Core
+ PRIVATE _javascript_Core${DEBUG_SUFFIX}
PRIVATE WebCore${DEBUG_SUFFIX}
PRIVATE PAL${DEBUG_SUFFIX}
)
@@ -42,7 +46,9 @@
WEBKIT_FRAMEWORK(WebKitLegacy)
-add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+ add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
+endif ()
if (TARGET WebKitLegacyGUID)
add_dependencies(WebKitLegacy WebKitLegacyGUID)
endif ()
Modified: branches/safari-608-branch/Source/WebKitLegacy/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,18 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * CMakeLists.txt:
+ * PlatformWin.cmake:
+ * WebKitLegacy.vcxproj/WebKitLegacy.proj:
+
2019-07-17 Kocsen Chung <kocsen_ch...@apple.com>
Cherry-pick r247486. rdar://problem/53229738
Modified: branches/safari-608-branch/Source/WebKitLegacy/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -24,6 +24,8 @@
PRIVATE CoreText${DEBUG_SUFFIX}
PRIVATE QuartzCore${DEBUG_SUFFIX}
PRIVATE libdispatch${DEBUG_SUFFIX}
+ PRIVATE libicuin${DEBUG_SUFFIX}
+ PRIVATE libicuuc${DEBUG_SUFFIX}
PRIVATE ${LIBXML2_LIBRARIES}
PRIVATE ${LIBXSLT_LIBRARIES}
PRIVATE ${SQLITE_LIBRARIES}
@@ -31,6 +33,8 @@
)
endif ()
+list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
+
add_custom_command(
OUTPUT ${WebKitLegacy_DERIVED_SOURCES_DIR}/WebKitVersion.h
MAIN_DEPENDENCY ${WEBKITLEGACY_DIR}/scripts/generate-webkitversion.pl
@@ -486,7 +490,9 @@
FILES ${WebKitLegacy_PUBLIC_FRAMEWORK_HEADERS}
FLATTENED
)
-add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+if (NOT INTERNAL_BUILD)
+ add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
+endif ()
set(WebKitLegacy_OUTPUT_NAME
WebKit${DEBUG_SUFFIX}
Modified: branches/safari-608-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj 2019-08-06 22:26:22 UTC (rev 248321)
@@ -28,7 +28,7 @@
<ProgramFilesAAS64>Program Files\Common Files\Apple\Apple Application Support</ProgramFilesAAS64>
<ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir>
<OutputDirectory>$(DSTROOT)</OutputDirectory>
- <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
+ <CMakeCommandCommon>cmake $(SRCROOT) -DPORT=AppleWin $(DebugSuffixDefinition) -DINTERNAL_BUILD=1 -DWEBKIT_LIBRARIES_DIR=$(WebKit_Libraries.Replace('\','/')) -DCMAKE_MODULE_PATH=$(SRCROOT.Replace('\','/'))/AppleInternal/tools/cmake -DCMAKE_BINARY_DIR=$(OBJROOT.Replace('\','/'))/$(CONFIG) -DCMAKE_BUILD_TYPE=$(CONFIGURATION) -DWEBKIT_DIR=$(SRCROOT.Replace('\','/')) -DWEBKITLEGACY_DIR=$(SRCROOT.Replace('\','/'))</CMakeCommandCommon>
</PropertyGroup>
<!-- Prepare for build -->
Modified: branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,16 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * WebKitQuartzCoreAdditions/CMakeLists.txt:
+
2019-07-29 Alan Coon <alanc...@apple.com>
Cherry-pick r247722. rdar://problem/53647293
Modified: branches/safari-608-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -44,6 +44,7 @@
include_directories(
.
+ "${WTF_FRAMEWORK_HEADERS_DIR}"
"${DERIVED_SOURCES_DIR}/ForwardingHeaders"
"${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"
"${CMAKE_BINARY_DIR}/../include/private"
@@ -59,7 +60,7 @@
set_target_properties(WebKitQuartzCoreAdditions PROPERTIES OUTPUT_NAME WebKitQuartzCoreAdditions${DEBUG_SUFFIX})
target_link_libraries(WebKitQuartzCoreAdditions
D3d9
- WebKit::WTF
+ WTF${DEBUG_SUFFIX}
CoreFoundation${DEBUG_SUFFIX}
CoreGraphics${DEBUG_SUFFIX}
QuartzCore${DEBUG_SUFFIX}
Added: branches/safari-608-branch/Source/cmake/FindICU.cmake (0 => 248321)
--- branches/safari-608-branch/Source/cmake/FindICU.cmake (rev 0)
+++ branches/safari-608-branch/Source/cmake/FindICU.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -0,0 +1,110 @@
+# Finds the International Components for Unicode (ICU) Library
+#
+# ICU_FOUND - True if ICU found.
+# ICU_I18N_FOUND - True if ICU's internationalization library found.
+# ICU_INCLUDE_DIRS - Directory to include to get ICU headers
+# Note: always include ICU headers as, e.g.,
+# unicode/utypes.h
+# ICU_LIBRARIES - Libraries to link against for the common ICU
+# ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation
+# (note: in addition to ICU_LIBRARIES)
+
+find_package(PkgConfig)
+pkg_check_modules(PC_ICU icu-uc)
+
+# Look for the header file.
+find_path(
+ ICU_INCLUDE_DIR
+ NAMES unicode/utypes.h
+ HINTS ${PC_ICU_INCLUDE_DIRS}
+ ${PC_ICU_INCLUDEDIR}
+ ${WEBKIT_LIBRARIES_INCLUDE_DIR}
+ DOC "Include directory for the ICU library")
+mark_as_advanced(ICU_INCLUDE_DIR)
+
+# Look for the library.
+find_library(
+ ICU_LIBRARY
+ NAMES libicuuc cygicuuc cygicuuc32 icuuc
+ HINTS ${PC_ICU_LIBRARY_DIRS}
+ ${PC_ICU_LIBDIR}
+ ${WEBKIT_LIBRARIES_LINK_DIR}
+ DOC "Libraries to link against for the common parts of ICU")
+mark_as_advanced(ICU_LIBRARY)
+
+# Copy the results to the output variables.
+if (ICU_INCLUDE_DIR AND ICU_LIBRARY)
+ set(ICU_FOUND 1)
+ set(ICU_LIBRARIES ${ICU_LIBRARY})
+ set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR})
+
+ set(ICU_VERSION 0)
+ set(ICU_MAJOR_VERSION 0)
+ set(ICU_MINOR_VERSION 0)
+ file(READ "${ICU_INCLUDE_DIR}/unicode/uversion.h" _ICU_VERSION_CONENTS)
+ string(REGEX REPLACE ".*#define U_ICU_VERSION_MAJOR_NUM ([0-9]+).*" "\\1" ICU_MAJOR_VERSION "${_ICU_VERSION_CONENTS}")
+ string(REGEX REPLACE ".*#define U_ICU_VERSION_MINOR_NUM ([0-9]+).*" "\\1" ICU_MINOR_VERSION "${_ICU_VERSION_CONENTS}")
+
+ set(ICU_VERSION "${ICU_MAJOR_VERSION}.${ICU_MINOR_VERSION}")
+
+ # Look for the ICU internationalization libraries
+ pkg_check_modules(PC_ICU_I18N icu-i18n)
+ find_library(
+ ICU_I18N_LIBRARY
+ NAMES icui18n libicui18n libicuin cygicuin cygicuin32 icuin
+ HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+ ${PC_ICU_I18N_LIBDIR}
+ ${WEBKIT_LIBRARIES_LINK_DIR}
+ DOC "Libraries to link against for ICU internationalization")
+ mark_as_advanced(ICU_I18N_LIBRARY)
+ if (ICU_I18N_LIBRARY)
+ set(ICU_I18N_FOUND 1)
+ set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY})
+ else ()
+ set(ICU_I18N_FOUND 0)
+ set(ICU_I18N_LIBRARIES)
+ endif ()
+
+ # Look for the ICU data libraries
+ find_library(
+ ICU_DATA_LIBRARY
+ NAMES icudata libicudata cygicudata cygicudata32
+ HINTS ${PC_ICU_I18N_LIBRARY_DIRS}
+ ${PC_ICU_I18N_LIBDIR}
+ ${WEBKIT_LIBRARIES_LINK_DIR}
+ DOC "Libraries to link against for ICU data")
+ mark_as_advanced(ICU_DATA_LIBRARY)
+ if (ICU_DATA_LIBRARY)
+ set(ICU_DATA_FOUND 1)
+ set(ICU_DATA_LIBRARIES ${ICU_DATA_LIBRARY})
+ else ()
+ set(ICU_DATA_FOUND 0)
+ set(ICU_DATA_LIBRARIES)
+ endif ()
+else ()
+ set(ICU_FOUND 0)
+ set(ICU_I18N_FOUND 0)
+ set(ICU_DATA_FOUND 0)
+ set(ICU_LIBRARIES)
+ set(ICU_I18N_LIBRARIES)
+ set(ICU_DATA_LIBRARIES)
+ set(ICU_INCLUDE_DIRS)
+ set(ICU_VERSION)
+ set(ICU_MAJOR_VERSION)
+ set(ICU_MINOR_VERSION)
+endif ()
+
+if (ICU_FOUND)
+ if (NOT ICU_FIND_QUIETLY)
+ message(STATUS "Found ICU header files in ${ICU_INCLUDE_DIRS}")
+ message(STATUS "Found ICU libraries: ${ICU_LIBRARIES}")
+ message(STATUS "Found ICU internationaliation libraries: ${ICU_I18N_LIBRARIES}")
+ message(STATUS "Found ICU data libraries: ${ICU_DATA_LIBRARIES}")
+ endif ()
+else ()
+ if (ICU_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find ICU")
+ else ()
+ message(STATUS "Optional package ICU was not found")
+ endif ()
+endif ()
Modified: branches/safari-608-branch/Source/cmake/OptionsAppleWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsAppleWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsAppleWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -17,8 +17,6 @@
set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
-include(target/icu)
-
# Uncomment the following line to try the Direct2D backend.
# set(USE_DIRECT2D 1)
Modified: branches/safari-608-branch/Source/cmake/OptionsGTK.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsGTK.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsGTK.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -25,7 +25,7 @@
find_package(GTK3 3.22.0 REQUIRED)
find_package(GDK3 3.22.0 REQUIRED)
find_package(HarfBuzz 0.9.2 REQUIRED)
-find_package(ICU REQUIRED COMPONENTS data i18n uc)
+find_package(ICU REQUIRED)
find_package(JPEG REQUIRED)
find_package(LibSoup 2.54.0 REQUIRED)
find_package(LibXml2 2.8.0 REQUIRED)
Modified: branches/safari-608-branch/Source/cmake/OptionsPlayStation.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsPlayStation.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsPlayStation.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -80,7 +80,7 @@
find_package(Fontconfig REQUIRED)
find_package(Freetype REQUIRED)
find_package(HarfBuzz REQUIRED)
-find_package(ICU REQUIRED COMPONENTS data i18n uc)
+find_package(ICU REQUIRED)
find_package(JPEG REQUIRED)
find_package(LibPSL REQUIRED)
find_package(LibXml2 REQUIRED)
Modified: branches/safari-608-branch/Source/cmake/OptionsWPE.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsWPE.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsWPE.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -17,7 +17,7 @@
find_package(Freetype 2.4.2 REQUIRED)
find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
find_package(HarfBuzz 0.9.18 REQUIRED)
-find_package(ICU REQUIRED COMPONENTS data i18n uc)
+find_package(ICU REQUIRED)
find_package(JPEG REQUIRED)
find_package(LibEpoxy 1.4.0 REQUIRED)
find_package(LibGcrypt 1.6.0 REQUIRED)
Modified: branches/safari-608-branch/Source/cmake/OptionsWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -166,6 +166,8 @@
set(WebCore_LIBRARY_TYPE OBJECT)
endif ()
+find_package(ICU REQUIRED)
+
# If <winsock2.h> is not included before <windows.h> redefinition errors occur
# unless _WINSOCKAPI_ is defined before <windows.h> is included
add_definitions(-D_WINSOCKAPI_=)
Modified: branches/safari-608-branch/Source/cmake/OptionsWinCairo.cmake (248320 => 248321)
--- branches/safari-608-branch/Source/cmake/OptionsWinCairo.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Source/cmake/OptionsWinCairo.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -4,7 +4,6 @@
find_package(Cairo 1.15.12 REQUIRED)
find_package(CURL 7.60.0 REQUIRED)
-find_package(ICU REQUIRED COMPONENTS data i18n uc)
find_package(JPEG 1.5.2 REQUIRED)
find_package(LibXml2 2.9.7 REQUIRED)
find_package(OpenSSL 2.0.0 REQUIRED)
Modified: branches/safari-608-branch/Tools/ChangeLog (248320 => 248321)
--- branches/safari-608-branch/Tools/ChangeLog 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/ChangeLog 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,3 +1,28 @@
+2019-08-06 Alan Coon <alanc...@apple.com>
+
+ Apply patch. rdar://problem/53992160
+
+ 2019-08-06 Per Arne Vollan <pvol...@apple.com>
+
+ [Win] Fix AppleWin build
+ https://bugs.webkit.org/show_bug.cgi?id=200414
+
+ Reviewed by Brent Fulgham.
+
+ * DumpRenderTree/CMakeLists.txt:
+ * DumpRenderTree/PlatformWin.cmake:
+ * MiniBrowser/win/CMakeLists.txt:
+ * TestWebKitAPI/CMakeLists.txt:
+ * TestWebKitAPI/PlatformGTK.cmake:
+ * TestWebKitAPI/PlatformMac.cmake:
+ * TestWebKitAPI/PlatformPlayStation.cmake:
+ * TestWebKitAPI/PlatformWPE.cmake:
+ * TestWebKitAPI/PlatformWin.cmake:
+ * TestWebKitAPI/glib/CMakeLists.txt:
+ * WebKitTestRunner/CMakeLists.txt:
+ * WebKitTestRunner/PlatformGTK.cmake:
+ * WebKitTestRunner/PlatformWin.cmake:
+
2019-08-01 Ryan Haddad <ryanhad...@apple.com>
Cherry-pick r248116. rdar://problem/53829168
Modified: branches/safari-608-branch/Tools/DumpRenderTree/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Tools/DumpRenderTree/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/DumpRenderTree/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -23,7 +23,7 @@
set(DumpRenderTree_LIBRARIES
WebCoreTestSupport
- WebKit::_javascript_Core
+ _javascript_Core
)
set(DumpRenderTree_INCLUDE_DIRECTORIES
@@ -67,7 +67,8 @@
)
set(TestNetscapePlugIn_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core
+ WTF
WebCoreTestSupport
)
Modified: branches/safari-608-branch/Tools/DumpRenderTree/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/DumpRenderTree/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/DumpRenderTree/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -68,6 +68,7 @@
)
list(APPEND DumpRenderTree_LIBRARIES
+ WTF
WebKitLegacy
shlwapi
)
Modified: branches/safari-608-branch/Tools/MiniBrowser/win/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Tools/MiniBrowser/win/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/MiniBrowser/win/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -1,4 +1,7 @@
set(MiniBrowser_INCLUDE_DIRECTORIES
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
${PAL_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
@@ -25,7 +28,7 @@
set(MiniBrowser_LIBRARIES
DbgHelp
- WebKit::WTF
+ WTF
WebKitLegacy
WebKitLegacyGUID
comctl32
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -103,13 +103,16 @@
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
+ ${WTF_FRAMEWORK_HEADERS_DIR}
)
set(TestWTF_LIBRARIES
- WebKit::WTF
+ WTF
gtest
)
+set(TestWTF_DEPENDENCIES WTFFrameworkHeaders)
+
WEBKIT_EXECUTABLE_DECLARE(TestWTF)
# TestWebCore definitions
@@ -154,6 +157,7 @@
${THIRDPARTY_DIR}/gtest/include
${PAL_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${WTF_FRAMEWORK_HEADERS_DIR}
)
set(TestWebCore_DEPENDENCIES WebCorePrivateFrameworkHeaders)
@@ -178,6 +182,7 @@
${THIRDPARTY_DIR}/gtest/include
${PAL_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${WTF_FRAMEWORK_HEADERS_DIR}
${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
)
@@ -246,7 +251,10 @@
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
${PAL_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_FRAMEWORK_HEADERS_DIR}
${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
+ ${WTF_FRAMEWORK_HEADERS_DIR}
${WebKit_FRAMEWORK_HEADERS_DIR}
)
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/PlatformGTK.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/PlatformGTK.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/PlatformGTK.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -108,6 +108,8 @@
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
${FORWARDING_HEADERS_DIR}
${FORWARDING_HEADERS_DIR}/_javascript_Core
${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
@@ -117,7 +119,7 @@
set(TestJSC_LIBRARIES
${GLIB_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
- WebKit::_javascript_Core
+ _javascript_Core
)
set(TestJSC_DEFINITIONS
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/PlatformMac.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/PlatformMac.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/PlatformMac.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -17,6 +17,7 @@
${CARBON_LIBRARY}
${COCOA_LIBRARY}
${COREFOUNDATION_LIBRARY}
+ ${ICU_LIBRARIES}
)
list(APPEND TestWebKitAPI_LIBRARIES
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/PlatformPlayStation.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/PlatformPlayStation.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/PlatformPlayStation.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -10,6 +10,10 @@
generic/UtilitiesGeneric.cpp
)
+list(APPEND TestWTF_PRIVATE_INCLUDE_DIRECTORIES
+ ${ICU_INCLUDE_DIRS}
+)
+
list(APPEND TestWebCore_SOURCES
${test_main_SOURCES}
)
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWPE.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWPE.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWPE.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -100,6 +100,8 @@
${CMAKE_BINARY_DIR}
${TESTWEBKITAPI_DIR}
${THIRDPARTY_DIR}/gtest/include
+ ${WTF_FRAMEWORK_HEADERS_DIR}
+ ${_javascript_Core_PRIVATE_FRAMEWORK_HEADERS_DIR}
${FORWARDING_HEADERS_DIR}
${FORWARDING_HEADERS_DIR}/_javascript_Core
${FORWARDING_HEADERS_DIR}/_javascript_Core/glib
@@ -109,7 +111,7 @@
set(TestJSC_LIBRARIES
${GLIB_LIBRARIES}
${GLIB_GMODULE_LIBRARIES}
- WebKit::_javascript_Core
+ _javascript_Core
)
set(TestJSC_DEFINITIONS
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -77,6 +77,8 @@
WebKitQuartzCoreAdditions${DEBUG_SUFFIX}
libdispatch${DEBUG_SUFFIX}
libexslt${DEBUG_SUFFIX}
+ libicuin${DEBUG_SUFFIX}
+ libicuuc${DEBUG_SUFFIX}
)
endif ()
@@ -107,7 +109,7 @@
list(APPEND TestWebKitLegacy_DEFINITIONS ${webcore_DEFINITIONS})
list(APPEND TestWebKitLegacy_LIBRARIES
- WebKit::WTF
+ WTF
)
list(APPEND TestWebKitLegacy_PRIVATE_INCLUDE_DIRECTORIES
Modified: branches/safari-608-branch/Tools/TestWebKitAPI/glib/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Tools/TestWebKitAPI/glib/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/TestWebKitAPI/glib/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -22,7 +22,7 @@
)
set(WebKitAPITest_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core
WebKit
)
@@ -34,7 +34,7 @@
)
set(WebKitGLibAPITestExtension_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core
WebKit
${GLIB_LIBRARIES}
)
Modified: branches/safari-608-branch/Tools/WebKitTestRunner/CMakeLists.txt (248320 => 248321)
--- branches/safari-608-branch/Tools/WebKitTestRunner/CMakeLists.txt 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/WebKitTestRunner/CMakeLists.txt 2019-08-06 22:26:22 UTC (rev 248321)
@@ -23,7 +23,7 @@
)
set(WebKitTestRunner_LIBRARIES
- WebKit::_javascript_Core
+ _javascript_Core
WebCoreTestSupport
WebKit
)
@@ -51,6 +51,7 @@
set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
${LIBSOUP_INCLUDE_DIRS}
+ ${ICU_INCLUDE_DIRS}
)
set(WebKitTestRunnerInjectedBundle_SOURCES
Modified: branches/safari-608-branch/Tools/WebKitTestRunner/PlatformGTK.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/WebKitTestRunner/PlatformGTK.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -30,6 +30,7 @@
${CAIRO_LIBRARIES}
${GTK3_LIBRARIES}
${GLIB_LIBRARIES}
+ WTF
WebCore
)
Modified: branches/safari-608-branch/Tools/WebKitTestRunner/PlatformWin.cmake (248320 => 248321)
--- branches/safari-608-branch/Tools/WebKitTestRunner/PlatformWin.cmake 2019-08-06 22:20:31 UTC (rev 248320)
+++ branches/safari-608-branch/Tools/WebKitTestRunner/PlatformWin.cmake 2019-08-06 22:26:22 UTC (rev 248321)
@@ -36,6 +36,7 @@
)
list(APPEND WebKitTestRunner_LIBRARIES
+ WTF
WebKit
)
@@ -44,6 +45,7 @@
WebKit
)
+
list(REMOVE_ITEM
WebKitTestRunnerLib_SOURCES
${WEBKIT_TESTRUNNER_BINDINGS_DIR}/JSWrapper.cpp
