⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 248321 in webkit


Ignore:
Timestamp:
Aug 6, 2019, 3:26:22 PM (7 years ago)
Author:
Alan Coon
Message:

Apply patch. rdar://problem/53992160

Location:
branches/safari-608-branch
Files:
1 added
47 edited

Legend:

Unmodified
Added
Removed

  • branches/safari-608-branch/CMakeLists.txt

    r246884 r248321  
    99#
    1010
    11 cmake_minimum_required(VERSION 3.10)
     11cmake_minimum_required(VERSION 3.7)
    1212
    1313project(WebKit)

  • branches/safari-608-branch/ChangeLog

    r247367 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13            * Source/cmake/FindICU.cmake: Added.
     14            * Source/cmake/OptionsAppleWin.cmake:
     15            * Source/cmake/OptionsGTK.cmake:
     16            * Source/cmake/OptionsPlayStation.cmake:
     17            * Source/cmake/OptionsWPE.cmake:
     18            * Source/cmake/OptionsWin.cmake:
     19            * Source/cmake/OptionsWinCairo.cmake:
     20
    1212019-07-11  Pablo Saavedra  <psaavedra@igalia.com>
    222

  • branches/safari-608-branch/Source/JavaScriptCore/CMakeLists.txt

    r247097 r248321  
    88
    99set(JavaScriptCore_INCLUDE_DIRECTORIES
     10    "${WTF_FRAMEWORK_HEADERS_DIR}"
    1011    "${JavaScriptCore_FRAMEWORK_HEADERS_DIR}"
    1112)
    … …  
    5354    list(APPEND JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES "${THIRDPARTY_DIR}/capstone/Source/include")
    5455endif ()
     56
     57set(JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES
     58    "${ICU_INCLUDE_DIRS}"
     59)
    5560
    5661set(JavaScriptCore_OBJECT_LUT_SOURCES
    … …  
    117122
    118123set(JavaScriptCore_LIBRARIES
    119     WebKit::WTF
     124    WTF${DEBUG_SUFFIX}
     125    ${ICU_I18N_LIBRARIES}
    120126)
    121127
    … …  
    291297)
    292298
    293 target_link_libraries(LLIntSettingsExtractor WebKit::WTF)
    294 add_dependencies(LLIntSettingsExtractor JavaScriptCore_CopyHeaders)
    295 target_link_libraries(LLIntOffsetsExtractor WebKit::WTF)
    296 add_dependencies(LLIntOffsetsExtractor JavaScriptCore_CopyHeaders)
     299target_link_libraries(LLIntSettingsExtractor WTF)
     300add_dependencies(LLIntSettingsExtractor JavaScriptCoreFrameworkHeaders)
     301target_link_libraries(LLIntOffsetsExtractor WTF)
     302add_dependencies(LLIntOffsetsExtractor JavaScriptCoreFrameworkHeaders)
    297303
    298304# The build system will execute asm.rb every time LLIntOffsetsExtractor's mtime is newer than
    … …  
    12741280endif ()
    12751281
    1276 set(JavaScriptCore_INTERFACE_LIBRARIES JavaScriptCore)
    1277 set(JavaScriptCore_INTERFACE_INCLUDE_DIRECTORIES
    1278     ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
    1279     ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    1280 )
    1281 set(JavaScriptCore_INTERFACE_DEPENDENCIES
    1282     JavaScriptCore_CopyHeaders
    1283     JavaScriptCore_CopyPrivateHeaders
    1284 )
    1285 
    12861282WEBKIT_FRAMEWORK_DECLARE(JavaScriptCore)
    12871283WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    … …  
    12931289endif ()
    12941290
    1295 WEBKIT_COPY_FILES(JavaScriptCore_CopyHeaders
     1291WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
     1292    TARGET_NAME JavaScriptCoreFrameworkHeaders
    12961293    DESTINATION ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
    12971294    FILES ${JavaScriptCore_PUBLIC_FRAMEWORK_HEADERS}
    … …  
    12991296)
    13001297
    1301 WEBKIT_COPY_FILES(JavaScriptCore_CopyPrivateHeaders
     1298WEBKIT_MAKE_FORWARDING_HEADERS(JavaScriptCore
     1299    TARGET_NAME JavaScriptCorePrivateFrameworkHeaders
    13021300    DESTINATION ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}/JavaScriptCore
    13031301    FILES ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS}
    13041302    FLATTENED
    13051303)
    1306 # JavaScriptCore_CopyPrivateHeaders needs to have a direct or indirect
    1307 # dependency of JavaScriptCore for CMake Visual Studio generator to
    1308 # eliminate duplicated custom commands. Otherwise,
    1309 # CombinedDomains.json will be generated in both projects.
    1310 add_dependencies(JavaScriptCore_CopyPrivateHeaders JavaScriptCore)
    13111304
    13121305target_include_directories(LLIntSettingsExtractor PRIVATE
    … …  
    13271320WEBKIT_WRAP_SOURCELIST(${JavaScriptCore_SOURCES})
    13281321WEBKIT_FRAMEWORK(JavaScriptCore)
    1329 WEBKIT_FRAMEWORK_TARGET(JavaScriptCore)
    13301322
    13311323if (NOT "${PORT}" STREQUAL "Mac")

  • branches/safari-608-branch/Source/JavaScriptCore/ChangeLog

    r247965 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13            * PlatformWin.cmake:
     14            * shell/CMakeLists.txt:
     15
    1162019-07-29  Alan Coon  <alancoon@apple.com>
    217

  • branches/safari-608-branch/Source/JavaScriptCore/PlatformWin.cmake

    r245492 r248321  
    2828if (NOT WTF_PLATFORM_WIN_CAIRO)
    2929    list(APPEND JavaScriptCore_LIBRARIES
     30        ${ICU_LIBRARIES}
    3031        winmm
    3132    )

  • branches/safari-608-branch/Source/JavaScriptCore/shell/CMakeLists.txt

    r247403 r248321  
    99set(jsc_LIBRARIES
    1010    ${CMAKE_DL_LIBS}
    11     WebKit::JavaScriptCore
     11    JavaScriptCore${DEBUG_SUFFIX}
     12    WTF${DEBUG_SUFFIX}
    1213)
    1314
    … …  
    1516    ${JavaScriptCore_INCLUDE_DIRECTORIES}
    1617    ${JavaScriptCore_PRIVATE_INCLUDE_DIRECTORIES}
     18    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    1719    ${JavaScriptCore_SYSTEM_INCLUDE_DIRECTORIES}
    1820)
    … …  
    2022if (WTF_OS_MAC_OS_X)
    2123    list(APPEND jsc_LIBRARIES edit)
     24endif ()
     25
     26if (WIN32)
     27    list(APPEND jsc_LIBRARIES Winmm)
    2228endif ()
    2329
    … …  
    4147    set(testapi_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    4248    set(testapi_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    43     set(testapi_LIBRARIES WebKit::JavaScriptCore)
     49    set(testapi_LIBRARIES JavaScriptCore)
    4450
    4551    set(testmasm_SOURCES ../assembler/testmasm.cpp)
    4652    set(testmasm_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    4753    set(testmasm_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    48     set(testmasm_LIBRARIES WebKit::JavaScriptCore)
     54    set(testmasm_LIBRARIES JavaScriptCore)
    4955
    5056    set(testRegExp_SOURCES ../testRegExp.cpp)
    5157    set(testRegExp_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    5258    set(testRegExp_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    53     set(testRegExp_LIBRARIES WebKit::JavaScriptCore)
     59    set(testRegExp_LIBRARIES JavaScriptCore)
    5460
    5561    set(testb3_SOURCES ../b3/testb3.cpp)
    5662    set(testb3_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    5763    set(testb3_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    58     set(testb3_LIBRARIES WebKit::JavaScriptCore)
     64    set(testb3_LIBRARIES JavaScriptCore)
    5965
    6066    set(testair_SOURCES ../b3/air/testair.cpp)
    6167    set(testair_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    6268    set(testair_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    63     set(testair_LIBRARIES WebKit::JavaScriptCore)
     69    set(testair_LIBRARIES JavaScriptCore)
    6470
    6571    set(testdfg_SOURCES ../dfg/testdfg.cpp)
    6672    set(testdfg_DEFINITIONS ${jsc_PRIVATE_DEFINITIONS})
    6773    set(testdfg_PRIVATE_INCLUDE_DIRECTORIES ${jsc_PRIVATE_INCLUDE_DIRECTORIES})
    68     set(testdfg_LIBRARIES WebKit::JavaScriptCore)
     74    set(testdfg_LIBRARIES JavaScriptCore)
    6975
    7076    WEBKIT_EXECUTABLE_DECLARE(testapi)

  • branches/safari-608-branch/Source/WTF/ChangeLog

    r248091 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * wtf/CMakeLists.txt:
     13            * wtf/PlatformPlayStation.cmake:
     14
    1152019-07-31  Alan Coon  <alancoon@apple.com>
    216

  • branches/safari-608-branch/Source/WTF/wtf/CMakeLists.txt

    r246490 r248321  
    455455    threads/Signals.cpp
    456456
    457     unicode/CollatorDefault.cpp
    458457    unicode/UTF8Conversion.cpp
    459 
    460     unicode/icu/CollatorICU.cpp
    461458)
    462459
    … …  
    489486endif ()
    490487
     488list(APPEND WTF_SOURCES
     489    unicode/CollatorDefault.cpp
     490
     491    unicode/icu/CollatorICU.cpp
     492)
     493set(WTF_SYSTEM_INCLUDE_DIRECTORIES
     494    ${ICU_INCLUDE_DIRS}
     495)
    491496list(APPEND WTF_LIBRARIES
    492     ICU::data
    493     ICU::i18n
    494     ICU::uc
    495 )
    496 
    497 set(WTF_INTERFACE_LIBRARIES WTF)
    498 set(WTF_INTERFACE_INCLUDE_DIRECTORIES ${WTF_FRAMEWORK_HEADERS_DIR})
    499 set(WTF_INTERFACE_DEPENDENCIES WTF_CopyHeaders)
     497    ${ICU_DATA_LIBRARIES}
     498    ${ICU_I18N_LIBRARIES}
     499    ${ICU_LIBRARIES}
     500)
    500501
    501502WEBKIT_FRAMEWORK_DECLARE(WTF)
    502503WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    503504
    504 WEBKIT_COPY_FILES(WTF_CopyHeaders
     505WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
     506WEBKIT_FRAMEWORK(WTF)
     507
     508WEBKIT_MAKE_FORWARDING_HEADERS(WTF
     509    TARGET_NAME WTFFrameworkHeaders
    505510    DESTINATION ${WTF_FRAMEWORK_HEADERS_DIR}/wtf
    506511    FILES ${WTF_PUBLIC_HEADERS}
    507512)
    508 
    509 WEBKIT_WRAP_SOURCELIST(${WTF_SOURCES})
    510 WEBKIT_FRAMEWORK(WTF)
    511 WEBKIT_FRAMEWORK_TARGET(WTF)
    512513
    513514if (MSVC)

  • branches/safari-608-branch/Source/WTF/wtf/PlatformPlayStation.cmake

    r245688 r248321  
    2121list(APPEND WTF_LIBRARIES
    2222    ${CMAKE_THREAD_LIBS_INIT}
     23    ${ICU_LIBRARIES}
    2324
    2425    ${C_STD_LIBRARY}

  • branches/safari-608-branch/Source/WebCore/CMakeLists.txt

    r247449 r248321  
    1818
    1919set(WebCore_INCLUDE_DIRECTORIES
     20    "${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}"
    2021    "${PAL_FRAMEWORK_HEADERS_DIR}"
    2122)
    … …  
    168169
    169170set(WebCore_SYSTEM_INCLUDE_DIRECTORIES
     171    ${ICU_INCLUDE_DIRS}
    170172    ${LIBXML2_INCLUDE_DIR}
    171173    ${LIBXSLT_INCLUDE_DIR}
    … …  
    11991201
    12001202set(WebCore_LIBRARIES
     1203    ${ICU_LIBRARIES}
    12011204    ${LIBXML2_LIBRARIES}
    12021205    ${LIBXSLT_LIBRARIES}
    … …  
    12071210
    12081211set(WebCoreTestSupport_LIBRARIES
    1209     WebKit::JavaScriptCore
     1212    JavaScriptCore${DEBUG_SUFFIX}
    12101213)
    12111214

  • branches/safari-608-branch/Source/WebCore/ChangeLog

    r248136 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13            * PlatformPlayStation.cmake:
     14            * PlatformWPE.cmake:
     15            * PlatformWin.cmake:
     16
    1172019-08-01  Alan Coon  <alancoon@apple.com>
    218

  • branches/safari-608-branch/Source/WebCore/PAL/ChangeLog

    r248091 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * pal/CMakeLists.txt:
     13
    1142019-07-31  Alan Coon  <alancoon@apple.com>
    215

  • branches/safari-608-branch/Source/WebCore/PAL/pal/CMakeLists.txt

    r246039 r248321  
    3838)
    3939
     40set(PAL_SYSTEM_INCLUDE_DIRECTORIES
     41    ${ICU_INCLUDE_DIRS}
     42)
     43
    4044set(PAL_LIBRARIES
    41     WebKit::JavaScriptCore
     45    JavaScriptCore${DEBUG_SUFFIX}
    4246)
    4347

  • branches/safari-608-branch/Source/WebCore/PlatformPlayStation.cmake

    r245492 r248321  
    8282
    8383list(APPEND WebCore_SYSTEM_INCLUDE_DIRECTORIES
     84    ${ICU_INCLUDE_DIRS}
    8485    ${LIBXML2_INCLUDE_DIR}
    8586    ${SQLITE_INCLUDE_DIR}
    … …  
    8990
    9091list(APPEND WebCore_LIBRARIES
     92    ${ICU_LIBRARIES}
    9193    ${LIBXML2_LIBRARIES}
    9294    ${SQLITE_LIBRARIES}

  • branches/safari-608-branch/Source/WebCore/PlatformWPE.cmake

    r245565 r248321  
    5555    ${GLIB_GOBJECT_LIBRARIES}
    5656    ${GLIB_LIBRARIES}
     57    ${ICU_LIBRARIES}
    5758    ${LIBTASN1_LIBRARIES}
    5859    ${UPOWERGLIB_LIBRARIES}
    … …  
    6465    ${GIO_UNIX_INCLUDE_DIRS}
    6566    ${GLIB_INCLUDE_DIRS}
     67    ${ICU_INCLUDE_DIRS}
    6668    ${LIBTASN1_INCLUDE_DIRS}
    6769    ${UPOWERGLIB_INCLUDE_DIRS}

  • branches/safari-608-branch/Source/WebCore/PlatformWin.cmake

    r245968 r248321  
    237237endif ()
    238238
    239 set(WebCore_OUTPUT_NAME WebCore${DEBUG_SUFFIX})
     239set(WebCore_OUTPUT_NAME
     240    WebCore${DEBUG_SUFFIX}
     241)
     242
     243list(APPEND WebCore_LIBRARIES WTF${DEBUG_SUFFIX})
     244list(APPEND WebCoreTestSupport_LIBRARIES WTF${DEBUG_SUFFIX})

  • branches/safari-608-branch/Source/WebDriver/CMakeLists.txt

    r245968 r248321  
    77    "${WEBDRIVER_DIR}"
    88    "${DERIVED_SOURCES_WEBDRIVER_DIR}"
     9    "${WTF_FRAMEWORK_HEADERS_DIR}"
    910)
    1011
    … …  
    1920
    2021set(WebDriver_LIBRARIES
    21     WebKit::WTF
     22    WTF
    2223)
    2324

  • branches/safari-608-branch/Source/WebDriver/ChangeLog

    r246035 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13            * PlatformWPE.cmake:
     14
    1152019-06-03  Carlos Garcia Campos  <cgarcia@igalia.com>
    216

  • branches/safari-608-branch/Source/WebDriver/PlatformWPE.cmake

    r246035 r248321  
    33list(APPEND WebDriver_SYSTEM_INCLUDE_DIRECTORIES
    44    "${GLIB_INCLUDE_DIRS}"
     5    "${ICU_INCLUDE_DIRS}"
    56    "${LIBSOUP_INCLUDE_DIRS}"
    67)

  • branches/safari-608-branch/Source/WebKit/CMakeLists.txt

    r246388 r248321  
    9999set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
    100100
     101set(WebKit_SYSTEM_INCLUDE_DIRECTORIES
     102    ${ICU_INCLUDE_DIRS}
     103)
     104
    101105list(APPEND WebKit_UNIFIED_SOURCE_LIST_FILES
    102106    "Sources.txt"

  • branches/safari-608-branch/Source/WebKit/ChangeLog

    r248114 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13
    1142019-08-01  Alan Coon  <alancoon@apple.com>
    215

  • branches/safari-608-branch/Source/WebKitLegacy/CMakeLists.txt

    r246874 r248321  
    2626)
    2727
     28set(WebKitLegacy_SYSTEM_INCLUDE_DIRECTORIES
     29    "${ICU_INCLUDE_DIRS}"
     30)
     31
    2832set(WebKitLegacy_LIBRARIES
    29     PRIVATE WebKit::JavaScriptCore
     33    PRIVATE JavaScriptCore${DEBUG_SUFFIX}
    3034    PRIVATE WebCore${DEBUG_SUFFIX}
    3135    PRIVATE PAL${DEBUG_SUFFIX}
    … …  
    4347WEBKIT_FRAMEWORK(WebKitLegacy)
    4448
    45 add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
     49if (NOT INTERNAL_BUILD)
     50    add_dependencies(WebKitLegacy WebCore WebCorePrivateFrameworkHeaders)
     51endif ()
    4652if (TARGET WebKitLegacyGUID)
    4753    add_dependencies(WebKitLegacy WebKitLegacyGUID)

  • branches/safari-608-branch/Source/WebKitLegacy/ChangeLog

    r247594 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * CMakeLists.txt:
     13            * PlatformWin.cmake:
     14            * WebKitLegacy.vcxproj/WebKitLegacy.proj:
     15
    1162019-07-17  Kocsen Chung  <kocsen_chung@apple.com>
    217

  • branches/safari-608-branch/Source/WebKitLegacy/PlatformWin.cmake

    r245968 r248321  
    2525        PRIVATE QuartzCore${DEBUG_SUFFIX}
    2626        PRIVATE libdispatch${DEBUG_SUFFIX}
     27        PRIVATE libicuin${DEBUG_SUFFIX}
     28        PRIVATE libicuuc${DEBUG_SUFFIX}
    2729        PRIVATE ${LIBXML2_LIBRARIES}
    2830        PRIVATE ${LIBXSLT_LIBRARIES}
    … …  
    3133    )
    3234endif ()
     35
     36list(APPEND WebKitLegacy_LIBRARIES PRIVATE WTF${DEBUG_SUFFIX})
    3337
    3438add_custom_command(
    … …  
    487491    FLATTENED
    488492)
    489 add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
     493if (NOT INTERNAL_BUILD)
     494    add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
     495endif ()
    490496
    491497set(WebKitLegacy_OUTPUT_NAME

  • branches/safari-608-branch/Source/WebKitLegacy/WebKitLegacy.vcxproj/WebKitLegacy.proj

    r225563 r248321  
    2929    <ConfigurationBuildDir>$(OBJROOT)\$(CONFIG)</ConfigurationBuildDir> 
    3030    <OutputDirectory>$(DSTROOT)</OutputDirectory>
    31         <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>
     31        <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>
    3232  </PropertyGroup>
    3333 

  • branches/safari-608-branch/Source/WebKitLegacy/win/ChangeLog

    r247967 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * WebKitQuartzCoreAdditions/CMakeLists.txt:
     13
    1142019-07-29  Alan Coon  <alancoon@apple.com>
    215

  • branches/safari-608-branch/Source/WebKitLegacy/win/WebKitQuartzCoreAdditions/CMakeLists.txt

    r245968 r248321  
    4545include_directories(
    4646    .
     47    "${WTF_FRAMEWORK_HEADERS_DIR}"
    4748    "${DERIVED_SOURCES_DIR}/ForwardingHeaders"
    4849    "${DERIVED_SOURCES_DIR}/WebKitQuartzCoreAdditions"
    … …  
    6061target_link_libraries(WebKitQuartzCoreAdditions
    6162    D3d9
    62     WebKit::WTF
     63    WTF${DEBUG_SUFFIX}
    6364    CoreFoundation${DEBUG_SUFFIX}
    6465    CoreGraphics${DEBUG_SUFFIX}

  • branches/safari-608-branch/Source/cmake/OptionsAppleWin.cmake

    r245492 r248321  
    1717set(ZLIB_INCLUDE_DIRS "${WEBKIT_LIBRARIES_DIR}/include/zlib")
    1818set(ZLIB_LIBRARIES zdll${DEBUG_SUFFIX})
    19 
    20 include(target/icu)
    2119
    2220# Uncomment the following line to try the Direct2D backend.

  • branches/safari-608-branch/Source/cmake/OptionsGTK.cmake

    r246925 r248321  
    2626find_package(GDK3 3.22.0 REQUIRED)
    2727find_package(HarfBuzz 0.9.2 REQUIRED)
    28 find_package(ICU REQUIRED COMPONENTS data i18n uc)
     28find_package(ICU REQUIRED)
    2929find_package(JPEG REQUIRED)
    3030find_package(LibSoup 2.54.0 REQUIRED)

  • branches/safari-608-branch/Source/cmake/OptionsPlayStation.cmake

    r247367 r248321  
    8181find_package(Freetype REQUIRED)
    8282find_package(HarfBuzz REQUIRED)
    83 find_package(ICU REQUIRED COMPONENTS data i18n uc)
     83find_package(ICU REQUIRED)
    8484find_package(JPEG REQUIRED)
    8585find_package(LibPSL REQUIRED)

  • branches/safari-608-branch/Source/cmake/OptionsWPE.cmake

    r247367 r248321  
    1818find_package(GLIB 2.44.0 REQUIRED COMPONENTS gio gio-unix gobject gthread gmodule)
    1919find_package(HarfBuzz 0.9.18 REQUIRED)
    20 find_package(ICU REQUIRED COMPONENTS data i18n uc)
     20find_package(ICU REQUIRED)
    2121find_package(JPEG REQUIRED)
    2222find_package(LibEpoxy 1.4.0 REQUIRED)

  • branches/safari-608-branch/Source/cmake/OptionsWin.cmake

    r247297 r248321  
    167167endif ()
    168168
     169find_package(ICU REQUIRED)
     170
    169171# If <winsock2.h> is not included before <windows.h> redefinition errors occur
    170172# unless _WINSOCKAPI_ is defined before <windows.h> is included

  • branches/safari-608-branch/Source/cmake/OptionsWinCairo.cmake

    r245536 r248321  
    55find_package(Cairo 1.15.12 REQUIRED)
    66find_package(CURL 7.60.0 REQUIRED)
    7 find_package(ICU REQUIRED COMPONENTS data i18n uc)
    87find_package(JPEG 1.5.2 REQUIRED)
    98find_package(LibXml2 2.9.7 REQUIRED)

  • branches/safari-608-branch/Tools/ChangeLog

    r248128 r248321  
     12019-08-06  Alan Coon  <alancoon@apple.com>
     2
     3        Apply patch. rdar://problem/53992160
     4
     5    2019-08-06  Per Arne Vollan  <pvollan@apple.com>
     6
     7            [Win] Fix AppleWin build
     8            https://bugs.webkit.org/show_bug.cgi?id=200414
     9
     10            Reviewed by Brent Fulgham.
     11
     12            * DumpRenderTree/CMakeLists.txt:
     13            * DumpRenderTree/PlatformWin.cmake:
     14            * MiniBrowser/win/CMakeLists.txt:
     15            * TestWebKitAPI/CMakeLists.txt:
     16            * TestWebKitAPI/PlatformGTK.cmake:
     17            * TestWebKitAPI/PlatformMac.cmake:
     18            * TestWebKitAPI/PlatformPlayStation.cmake:
     19            * TestWebKitAPI/PlatformWPE.cmake:
     20            * TestWebKitAPI/PlatformWin.cmake:
     21            * TestWebKitAPI/glib/CMakeLists.txt:
     22            * WebKitTestRunner/CMakeLists.txt:
     23            * WebKitTestRunner/PlatformGTK.cmake:
     24            * WebKitTestRunner/PlatformWin.cmake:
     25
    1262019-08-01  Ryan Haddad  <ryanhaddad@apple.com>
    227

  • branches/safari-608-branch/Tools/DumpRenderTree/CMakeLists.txt

    r246039 r248321  
    2424set(DumpRenderTree_LIBRARIES
    2525    WebCoreTestSupport
    26     WebKit::JavaScriptCore
     26    JavaScriptCore
    2727)
    2828
    … …  
    6868
    6969set(TestNetscapePlugIn_LIBRARIES
    70     WebKit::JavaScriptCore
     70    JavaScriptCore
     71    WTF
    7172    WebCoreTestSupport
    7273)

  • branches/safari-608-branch/Tools/DumpRenderTree/PlatformWin.cmake

    r245968 r248321  
    6969
    7070list(APPEND DumpRenderTree_LIBRARIES
     71    WTF
    7172    WebKitLegacy
    7273    shlwapi

  • branches/safari-608-branch/Tools/MiniBrowser/win/CMakeLists.txt

    r246039 r248321  
    11set(MiniBrowser_INCLUDE_DIRECTORIES
     2    ${WTF_FRAMEWORK_HEADERS_DIR}
     3    ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
     4    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    25    ${PAL_FRAMEWORK_HEADERS_DIR}
    36    ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    … …  
    2629set(MiniBrowser_LIBRARIES
    2730    DbgHelp
    28     WebKit::WTF
     31    WTF
    2932    WebKitLegacy
    3033    WebKitLegacyGUID

  • branches/safari-608-branch/Tools/TestWebKitAPI/CMakeLists.txt

    r246623 r248321  
    104104    ${TESTWEBKITAPI_DIR}
    105105    ${THIRDPARTY_DIR}/gtest/include
     106    ${WTF_FRAMEWORK_HEADERS_DIR}
    106107)
    107108
    108109set(TestWTF_LIBRARIES
    109     WebKit::WTF
     110    WTF
    110111    gtest
    111112)
     113
     114set(TestWTF_DEPENDENCIES WTFFrameworkHeaders)
    112115
    113116WEBKIT_EXECUTABLE_DECLARE(TestWTF)
    … …  
    155158        ${PAL_FRAMEWORK_HEADERS_DIR}
    156159        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     160        ${WTF_FRAMEWORK_HEADERS_DIR}
    157161    )
    158162
    … …  
    179183        ${PAL_FRAMEWORK_HEADERS_DIR}
    180184        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     185        ${WTF_FRAMEWORK_HEADERS_DIR}
    181186        ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}
    182187    )
    … …  
    247252        ${THIRDPARTY_DIR}/gtest/include
    248253        ${PAL_FRAMEWORK_HEADERS_DIR}
     254        ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     255        ${JavaScriptCore_FRAMEWORK_HEADERS_DIR}
    249256        ${WebCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
     257        ${WTF_FRAMEWORK_HEADERS_DIR}
    250258        ${WebKit_FRAMEWORK_HEADERS_DIR}
    251259    )

  • branches/safari-608-branch/Tools/TestWebKitAPI/PlatformGTK.cmake

    r246632 r248321  
    109109    ${TESTWEBKITAPI_DIR}
    110110    ${THIRDPARTY_DIR}/gtest/include
     111    ${WTF_FRAMEWORK_HEADERS_DIR}
     112    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    111113    ${FORWARDING_HEADERS_DIR}
    112114    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    … …  
    118120    ${GLIB_LIBRARIES}
    119121    ${GLIB_GMODULE_LIBRARIES}
    120     WebKit::JavaScriptCore
     122    JavaScriptCore
    121123)
    122124

  • branches/safari-608-branch/Tools/TestWebKitAPI/PlatformMac.cmake

    r246126 r248321  
    1818    ${COCOA_LIBRARY}
    1919    ${COREFOUNDATION_LIBRARY}
     20    ${ICU_LIBRARIES}
    2021)
    2122

  • branches/safari-608-branch/Tools/TestWebKitAPI/PlatformPlayStation.cmake

    r245492 r248321  
    1111)
    1212
     13list(APPEND TestWTF_PRIVATE_INCLUDE_DIRECTORIES
     14    ${ICU_INCLUDE_DIRS}
     15)
     16
    1317list(APPEND TestWebCore_SOURCES
    1418    ${test_main_SOURCES}

  • branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWPE.cmake

    r246039 r248321  
    101101    ${TESTWEBKITAPI_DIR}
    102102    ${THIRDPARTY_DIR}/gtest/include
     103    ${WTF_FRAMEWORK_HEADERS_DIR}
     104    ${JavaScriptCore_PRIVATE_FRAMEWORK_HEADERS_DIR}
    103105    ${FORWARDING_HEADERS_DIR}
    104106    ${FORWARDING_HEADERS_DIR}/JavaScriptCore
    … …  
    110112    ${GLIB_LIBRARIES}
    111113    ${GLIB_GMODULE_LIBRARIES}
    112     WebKit::JavaScriptCore
     114    JavaScriptCore
    113115)
    114116

  • branches/safari-608-branch/Tools/TestWebKitAPI/PlatformWin.cmake

    r247225 r248321  
    7878        libdispatch${DEBUG_SUFFIX}
    7979        libexslt${DEBUG_SUFFIX}
     80        libicuin${DEBUG_SUFFIX}
     81        libicuuc${DEBUG_SUFFIX}
    8082    )
    8183endif ()
    … …  
    108110
    109111    list(APPEND TestWebKitLegacy_LIBRARIES
    110         WebKit::WTF
     112        WTF
    111113    )
    112114

  • branches/safari-608-branch/Tools/TestWebKitAPI/glib/CMakeLists.txt

    r246039 r248321  
    2323
    2424set(WebKitAPITest_LIBRARIES
    25     WebKit::JavaScriptCore
     25    JavaScriptCore
    2626    WebKit
    2727)
    … …  
    3535
    3636set(WebKitGLibAPITestExtension_LIBRARIES
    37     WebKit::JavaScriptCore
     37    JavaScriptCore
    3838    WebKit
    3939    ${GLIB_LIBRARIES}

  • branches/safari-608-branch/Tools/WebKitTestRunner/CMakeLists.txt

    r246039 r248321  
    2424
    2525set(WebKitTestRunner_LIBRARIES
    26     WebKit::JavaScriptCore
     26    JavaScriptCore
    2727    WebCoreTestSupport
    2828    WebKit
    … …  
    5252set(WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES
    5353    ${LIBSOUP_INCLUDE_DIRS}
     54    ${ICU_INCLUDE_DIRS}
    5455)
    5556

  • branches/safari-608-branch/Tools/WebKitTestRunner/PlatformGTK.cmake

    r246639 r248321  
    3131    ${GTK3_LIBRARIES}
    3232    ${GLIB_LIBRARIES}
     33    WTF
    3334    WebCore
    3435)

  • branches/safari-608-branch/Tools/WebKitTestRunner/PlatformWin.cmake

    r245968 r248321  
    3737
    3838list(APPEND WebKitTestRunner_LIBRARIES
     39    WTF
    3940    WebKit
    4041)
    … …  
    4445    WebKit
    4546)
     47
    4648
    4749list(REMOVE_ITEM
Note: See TracChangeset for help on using the changeset viewer.