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

Changeset 246126 in webkit


Ignore:
Timestamp:
Jun 5, 2019, 2:11:39 PM (7 years ago)
Author:
commit-queue@webkit.org
Message:

Progress towards resurrecting Mac CMake build
​https://bugs.webkit.org/show_bug.cgi?id=197132

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-06-05
Reviewed by Don Olmstead.

Source/JavaScriptCore:

  • API/JSScript.mm:

(-[JSScript readCache]):
(-[JSScript sourceCode]):
(-[JSScript jsSourceCode]):
(-[JSScript writeCache:]):

  • CMakeLists.txt:

Source/WebCore:

  • CMakeLists.txt:
  • PlatformMac.cmake:
  • platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:

Source/WebCore/PAL:

  • pal/PlatformMac.cmake:

Source/WebKit:

  • PlatformMac.cmake:

Source/WebKitLegacy:

  • PlatformMac.cmake:
Location:
trunk
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/API/JSScript.mm

    r246060 r246126  
    3838#import "JSVirtualMachineInternal.h"
    3939#import "Symbol.h"
    40 #include <sys/stat.h>
    41 #include <wtf/FileMetadata.h>
    42 #include <wtf/FileSystem.h>
    43 #include <wtf/Scope.h>
    44 #include <wtf/spi/darwin/DataVaultSPI.h>
     40#import <sys/stat.h>
     41#import <wtf/FileMetadata.h>
     42#import <wtf/FileSystem.h>
     43#import <wtf/Scope.h>
     44#import <wtf/WeakObjCPtr.h>
     45#import <wtf/spi/darwin/DataVaultSPI.h>
    4546
    4647#if JSC_OBJC_API_ENABLED
    4748
    4849@implementation JSScript {
    49     __weak JSVirtualMachine* m_virtualMachine;
     50    WeakObjCPtr<JSVirtualMachine> m_virtualMachine;
    5051    JSScriptType m_type;
    5152    FileSystem::MappedFileData m_mappedSource;
    … …  
    170171    Ref<JSC::CachedBytecode> cachedBytecode = JSC::CachedBytecode::create(buffer, size);
    171172
    172     JSC::VM& vm = m_virtualMachine.vm;
     173    JSC::VM& vm = [m_virtualMachine vm];
    173174    JSC::SourceCode sourceCode = [self sourceCode];
    174175    JSC::SourceCodeKey key = m_type == kJSScriptTypeProgram ? sourceCodeKeyForSerializedProgram(vm, sourceCode) : sourceCodeKeyForSerializedModule(vm, sourceCode);
    … …  
    238239- (JSC::SourceCode)sourceCode
    239240{
    240     JSC::VM& vm = m_virtualMachine.vm;
     241    JSC::VM& vm = [m_virtualMachine vm];
    241242    JSC::JSLockHolder locker(vm);
    242243
    … …  
    251252- (JSC::JSSourceCode*)jsSourceCode
    252253{
    253     JSC::VM& vm = m_virtualMachine.vm;
     254    JSC::VM& vm = [m_virtualMachine vm];
    254255    JSC::JSLockHolder locker(vm);
    255256    JSC::JSSourceCode* jsSourceCode = JSC::JSSourceCode::create(vm, [self sourceCode]);
    … …  
    282283    switch (m_type) {
    283284    case kJSScriptTypeModule:
    284         m_cachedBytecode = JSC::generateModuleBytecode(m_virtualMachine.vm, sourceCode, fd, cacheError);
     285        m_cachedBytecode = JSC::generateModuleBytecode([m_virtualMachine vm], sourceCode, fd, cacheError);
    285286        break;
    286287    case kJSScriptTypeProgram:
    287         m_cachedBytecode = JSC::generateProgramBytecode(m_virtualMachine.vm, sourceCode, fd, cacheError);
     288        m_cachedBytecode = JSC::generateProgramBytecode([m_virtualMachine vm], sourceCode, fd, cacheError);
    288289        break;
    289290    }

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r246060 r246126  
    425425    API/JSStringRefPrivate.h
    426426    API/JSValueInternal.h
     427    API/JSValuePrivate.h
    427428    API/JSVirtualMachineInternal.h
    428429    API/JSWeakObjectMapRefInternal.h

  • trunk/Source/JavaScriptCore/ChangeLog

    r246124 r246126  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards resurrecting Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=197132
     5
     6        Reviewed by Don Olmstead.
     7
     8        * API/JSScript.mm:
     9        (-[JSScript readCache]):
     10        (-[JSScript sourceCode]):
     11        (-[JSScript jsSourceCode]):
     12        (-[JSScript writeCache:]):
     13        * CMakeLists.txt:
     14
    115== Rolled over to ChangeLog-2019-06-05 ==

  • trunk/Source/ThirdParty/ANGLE/CMakeLists.txt

    r245723 r246126  
    4242set(ANGLE_PRIVATE_INCLUDE_DIRECTORIES
    4343    "${CMAKE_CURRENT_SOURCE_DIR}/include"
     44    "${CMAKE_CURRENT_SOURCE_DIR}/include/KHR"
    4445    "${CMAKE_CURRENT_SOURCE_DIR}/src"
    4546    "${CMAKE_CURRENT_SOURCE_DIR}/src/common/third_party/base"

  • trunk/Source/WTF/wtf/PlatformMac.cmake

    r244090 r246126  
    2929    spi/cocoa/objcSPI.h
    3030
     31    spi/darwin/DataVaultSPI.h
    3132    spi/darwin/SandboxSPI.h
    3233    spi/darwin/XPCSPI.h

  • trunk/Source/WebCore/CMakeLists.txt

    r246070 r246126  
    6262    "${WEBCORE_DIR}/Modules/webdriver"
    6363    "${WEBCORE_DIR}/Modules/webgpu"
     64    "${WEBCORE_DIR}/Modules/webgpu/WHLSL"
     65    "${WEBCORE_DIR}/Modules/webgpu/WHLSL/AST"
    6466    "${WEBCORE_DIR}/Modules/websockets"
    6567    "${WEBCORE_DIR}/Modules/webvr"
    … …  
    18971899list(APPEND WebCoreTestSupport_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/InternalSettingsGenerated.cpp)
    18981900
    1899 
    19001901GENERATE_FONT_NAMES(${WEBCORE_DIR}/css/WebKitFontFamilyNames.in)
    19011902list(APPEND WebCore_SOURCES ${WebCore_DERIVED_SOURCES_DIR}/WebKitFontFamilyNames.cpp)

  • trunk/Source/WebCore/ChangeLog

    r246124 r246126  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards resurrecting Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=197132
     5
     6        Reviewed by Don Olmstead.
     7
     8        * CMakeLists.txt:
     9        * PlatformMac.cmake:
     10        * platform/cocoa/ContentFilterUnblockHandlerCocoa.mm:
     11
    112== Rolled over to ChangeLog-2019-06-05 ==

  • trunk/Source/WebCore/PAL/ChangeLog

    r246118 r246126  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards resurrecting Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=197132
     5
     6        Reviewed by Don Olmstead.
     7
     8        * pal/PlatformMac.cmake:
     9
    1102019-06-05  Wenson Hsieh  <wenson_hsieh@apple.com>
    211

  • trunk/Source/WebCore/PAL/pal/PlatformMac.cmake

    r244081 r246126  
    44    cf/CoreMediaSoftLink.h
    55
     6    cocoa/AVFoundationSoftLink.h
    67    cocoa/PassKitSoftLink.h
    78
    … …  
    2122    spi/cocoa/AudioToolboxSPI.h
    2223    spi/cocoa/CFNSURLConnectionSPI.h
     24    spi/cocoa/CommonCryptoSPI.h
    2325    spi/cocoa/CoreTextSPI.h
    2426    spi/cocoa/DataDetectorsCoreSPI.h

  • trunk/Source/WebCore/PlatformMac.cmake

    r245789 r246126  
    7272
    7373list(APPEND WebCore_PRIVATE_INCLUDE_DIRECTORIES
     74    "${WEBCORE_DIR}/Modules/webgpu/WHLSL/Metal"
    7475    "${WEBCORE_DIR}/accessibility/mac"
    7576    "${WEBCORE_DIR}/bridge/objc"
    … …  
    8485    "${WEBCORE_DIR}/page/cocoa"
    8586    "${WEBCORE_DIR}/page/mac"
     87    "${WEBCORE_DIR}/page/scrolling/cocoa"
    8688    "${WEBCORE_DIR}/page/scrolling/mac"
    8789    "${WEBCORE_DIR}/platform/audio/mac"
    … …  
    164166    page/scrolling/mac/ScrollingCoordinatorMac.mm
    165167    page/scrolling/mac/ScrollingMomentumCalculatorMac.mm
    166     page/scrolling/mac/ScrollingStateFrameScrollingNodeMac.mm
    167168    page/scrolling/mac/ScrollingTreeFrameScrollingNodeMac.mm
    168169    page/scrolling/mac/ScrollingTreeMac.cpp
    … …  
    230231
    231232    platform/graphics/avfoundation/objc/AVAssetTrackUtilities.mm
    232     platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.mm
    233233    platform/graphics/avfoundation/objc/AudioTrackPrivateAVFObjC.mm
    234234    platform/graphics/avfoundation/objc/AudioTrackPrivateMediaSourceAVFObjC.cpp
    … …  
    375375    platform/mac/WebGLBlacklist.mm
    376376    platform/mac/WebNSAttributedStringExtras.mm
    377     platform/mac/WebVideoFullscreenController.mm
    378     platform/mac/WebVideoFullscreenHUDWindowController.mm
    379377    platform/mac/WidgetMac.mm
    380378
    … …  
    475473    platform/cocoa/VideoFullscreenModel.h
    476474    platform/cocoa/VideoFullscreenModelVideoElement.h
     475    platform/cocoa/WebKitAvailability.h
    477476
    478477    platform/gamepad/cocoa/GameControllerGamepadProvider.h
    … …  
    483482    platform/graphics/avfoundation/MediaPlaybackTargetMac.h
    484483    platform/graphics/avfoundation/WebMediaSessionManagerMac.h
    485 
    486     platform/graphics/avfoundation/objc/AVFoundationMIMETypeCache.h
    487484
    488485    platform/graphics/ca/GraphicsLayerCA.h

  • trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm

    r244691 r246126  
    6767#import "TextCheckingHelper.h"
    6868#import "VisibleUnits.h"
     69#import "WebCoreFrameView.h"
     70
     71#if PLATFORM(MAC)
     72#import <pal/spi/mac/HIServicesSPI.h>
     73#else
    6974#import "WAKView.h"
    7075#import "WAKWindow.h"
    71 #import "WebCoreFrameView.h"
    72 
    73 #if PLATFORM(MAC)
    74 #import <pal/spi/mac/HIServicesSPI.h>
    7576#endif
    7677

  • trunk/Source/WebCore/config.h

    r239556 r246126  
    4040#define JSC_API_AVAILABLE(...)
    4141#endif
     42#ifndef JSC_CLASS_AVAILABLE
     43#define JSC_CLASS_AVAILABLE(...) JS_EXPORT
     44#endif
     45#ifndef JSC_API_DEPRECATED
     46#define JSC_API_DEPRECATED(...)
     47#endif
    4248#endif
    4349

  • trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp

    r245494 r246126  
    813813    case CSSPropertyWebkitOverflowScrolling:
    814814        if (!context.legacyOverflowScrollingTouchEnabled)
    815             return nullptr;
     815            return false;
    816816        return valueID == CSSValueAuto || valueID == CSSValueTouch;
    817817#endif

  • trunk/Source/WebCore/editing/cocoa/HTMLConverter.mm

    r245508 r246126  
    6767#import "VisibleSelection.h"
    6868#import <objc/runtime.h>
    69 #import <pal/ios/UIKitSoftLink.h>
    7069#import <pal/spi/cocoa/NSAttributedStringSPI.h>
    71 #import <pal/spi/ios/UIKitSPI.h>
    7270#import <wtf/ASCIICType.h>
    7371#import <wtf/text/StringBuilder.h>
    … …  
    7674
    7775#import "WAKAppKitStubs.h"
     76#import <pal/ios/UIKitSoftLink.h>
     77#import <pal/spi/ios/UIKitSPI.h>
    7878
    7979SOFT_LINK_CLASS(UIFoundation, NSColor)

  • trunk/Source/WebCore/platform/cocoa/ContentFilterUnblockHandlerCocoa.mm

    r241299 r246126  
    3636#import <wtf/SoftLinking.h>
    3737#import <wtf/text/CString.h>
     38
     39#if PLATFORM(IOS_FAMILY)
    3840#import "WebCoreThreadRun.h"
     41#endif
    3942
    4043static NSString * const unblockURLHostKey { @"unblockURLHost" };

  • trunk/Source/WebCore/platform/ios/WebItemProviderPasteboard.h

    r241749 r246126  
    2424 */
    2525
     26#if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
     27
    2628#import <WebCore/AbstractPasteboard.h>
    27 
    28 #if TARGET_OS_IPHONE && __IPHONE_OS_VERSION_MIN_REQUIRED >= 110000
    2929
    3030struct CGSize;

  • trunk/Source/WebKit/ChangeLog

    r246125 r246126  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards resurrecting Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=197132
     5
     6        Reviewed by Don Olmstead.
     7
     8        * PlatformMac.cmake:
     9
    1102019-06-05  Youenn Fablet  <youenn@apple.com>
    211

  • trunk/Source/WebKit/PlatformMac.cmake

    r245540 r246126  
    136136    Shared/cg/ShareableBitmapCG.cpp
    137137
    138     Shared/mac/ArgumentCodersMac.mm
    139138    Shared/mac/AttributedString.mm
    140139    Shared/mac/AuxiliaryProcessMac.mm
    … …  
    150149    Shared/mac/PasteboardTypes.mm
    151150    Shared/mac/PrintInfoMac.mm
    152     Shared/mac/SandboxExtensionMac.mm
    153     Shared/mac/SandboxInitialiationParametersMac.mm
    154     Shared/mac/SandboxUtilities.mm
    155151    Shared/mac/SecItemRequestData.cpp
    156152    Shared/mac/SecItemResponseData.cpp
    … …  
    427423
    428424set(XPCService_SOURCES
    429     Shared/EntryPointUtilities/mac/XPCService/XPCServiceEntryPoint.mm
    430     Shared/EntryPointUtilities/mac/XPCService/XPCServiceMain.mm
     425    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceEntryPoint.mm
     426    Shared/EntryPointUtilities/Cocoa/XPCService/XPCServiceMain.mm
    431427)
    432428
    433429set(WebProcess_SOURCES
    434     WebProcess/EntryPoint/mac/XPCService/WebContentServiceEntryPoint.mm
     430    WebProcess/EntryPoint/Cocoa/XPCService/WebContentServiceEntryPoint.mm
    435431    ${XPCService_SOURCES}
    436432)
    437433
    438434set(PluginProcess_SOURCES
    439     PluginProcess/EntryPoint/mac/XPCService/PluginServiceEntryPoint.mm
     435    PluginProcess/EntryPoint/Cocoa/XPCService/PluginServiceEntryPoint.mm
    440436    ${XPCService_SOURCES}
    441437)
    442438
    443439list(APPEND NetworkProcess_SOURCES
    444     NetworkProcess/EntryPoint/mac/XPCService/NetworkServiceEntryPoint.mm
     440    NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkServiceEntryPoint.mm
    445441    ${XPCService_SOURCES}
    446442)
    … …  
    768764    WEBKIT_XPC_SERVICE(WebProcess
    769765        "com.apple.WebKit.WebContent"
    770         ${WEBKIT_DIR}/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist
     766        ${WEBKIT_DIR}/WebProcess/EntryPoint/Cocoa/XPCService/WebContentService/Info-OSX.plist
    771767        ${WebKit_WebProcess_OUTPUT_NAME})
    772768
    773769    WEBKIT_XPC_SERVICE(NetworkProcess
    774770        "com.apple.WebKit.Networking"
    775         ${WEBKIT_DIR}/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist
     771        ${WEBKIT_DIR}/NetworkProcess/EntryPoint/Cocoa/XPCService/NetworkService/Info-OSX.plist
    776772        ${WebKit_NetworkProcess_OUTPUT_NAME})
    777773

  • trunk/Source/WebKitLegacy/ChangeLog

    r246039 r246126  
     12019-06-05  Alex Christensen  <achristensen@webkit.org>
     2
     3        Progress towards resurrecting Mac CMake build
     4        https://bugs.webkit.org/show_bug.cgi?id=197132
     5
     6        Reviewed by Don Olmstead.
     7
     8        * PlatformMac.cmake:
     9
    1102019-06-03  Don Olmstead  <don.olmstead@sony.com>
    211

  • trunk/Source/WebKitLegacy/PlatformMac.cmake

    r244488 r246126  
    2323list(APPEND WebKitLegacy_SOURCES
    2424    cf/WebCoreSupport/WebInspectorClientCF.cpp
    25 
    26     mac/Carbon/CarbonUtils.m
    27     mac/Carbon/CarbonWindowAdapter.mm
    28     mac/Carbon/CarbonWindowContentView.m
    29     mac/Carbon/CarbonWindowFrame.m
    30     mac/Carbon/HIViewAdapter.m
    31     mac/Carbon/HIWebView.mm
    3225
    3326    mac/DOM/DOM.mm
    … …  
    339332    mac/Storage/WebDatabaseManagerPrivate.h
    340333
    341     mac/WebCoreSupport/WebKeyGenerator.h
    342 
    343334    mac/WebInspector/WebInspector.h
    344335
    … …  
    432423)
    433424
    434 WEBKIT_CREATE_FORWARDING_HEADERS(WebKitLegacy DIRECTORIES ${WebKitLegacy_FORWARDING_HEADERS_DIRECTORIES} FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES})
    435 
    436 # FIXME: Forwarding headers should be copies of actual headers.
    437 file(GLOB ObjCHeaders ${WEBCORE_DIR}/plugins/*.h)
    438 list(APPEND ObjCHeaders
    439     WebKitAvailability.h
    440     WebScriptObject.h
    441 )
    442 foreach (_file ${ObjCHeaders})
    443     get_filename_component(_name ${_file} NAME)
    444     if (NOT EXISTS ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name})
    445         file(WRITE ${FORWARDING_HEADERS_DIR}/WebKitLegacy/${_name} "#import <WebCore/${_name}>")
    446     endif ()
    447 endforeach ()
     425WEBKIT_MAKE_FORWARDING_HEADERS(WebKitLegacy
     426    TARGET_NAME WebKitLegacyFrameworkHeaders
     427    DESTINATION ${WebKitLegacy_FRAMEWORK_HEADERS_DIR}/WebKitLegacy
     428    FILES ${WebKitLegacy_FORWARDING_HEADERS_FILES}
     429    FLATTENED
     430)
     431add_dependencies(WebKitLegacyFrameworkHeaders WebCorePrivateFrameworkHeaders)
    448432
    449433set(WebKitLegacy_OUTPUT_NAME WebKitLegacy)

  • trunk/Source/cmake/OptionsJSCOnly.cmake

    r245492 r246126  
    100100else ()
    101101    add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
    102     include(target/icu.cmake)
     102    include(target/icu)
    103103endif ()

  • trunk/Source/cmake/OptionsMac.cmake

    r245492 r246126  
    4141WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_VIDEO_PRESENTATION_MODE PRIVATE ON)
    4242WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGL2 PRIVATE ON)
    43 WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE ON)
     43WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WEBGPU PRIVATE OFF)
    4444WEBKIT_OPTION_DEFAULT_PORT_VALUE(ENABLE_WIRELESS_PLAYBACK_TARGET PRIVATE ON)
    4545
    … …  
    6161
    6262add_definitions(-DU_DISABLE_RENAMING=1 -DU_SHOW_CPLUSPLUS_API=0)
    63 include(target/icu.cmake)
     63include(target/icu)

  • trunk/Source/cmake/target/icu.cmake

    r245492 r246126  
    11# Apple ports provide their own ICU that can't be found by find_package(ICU).
    22# This file will create targets that would be created by find_package(ICU).
    3 if (NOT TARGET ICU::data)
    4     if (APPLE)
    5         set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
     3if (APPLE)
     4    set(ICU_INCLUDE_DIRS ${CMAKE_BINARY_DIR}/ICU/Headers)
    65
    7         # Apple just has a single dylib for ICU
    8         set(ICU_I18N_LIBRARY libicucore.dylib)
    9         set(ICU_UC_LIBRARY libicucore.dylib)
    10         set(ICU_DATA_LIBRARY libicucore.dylib)
     6    # Apple just has a single dylib for ICU
     7    set(ICU_I18N_LIBRARY /usr/lib/libicucore.dylib)
     8    set(ICU_UC_LIBRARY /usr/lib/libicucore.dylib)
     9    set(ICU_DATA_LIBRARY /usr/lib/libicucore.dylib)
    1110
    12         set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
    13     elseif (WIN32 AND NOT WTF_PLATFORM_WIN_CAIRO)
    14         set(ICU_INCLUDE_DIRS ${WEBKIT_LIBRARIES_INCLUDE_DIR})
     11    set(ICU_LIBRARIES ${ICU_UC_LIBRARY})
     12elseif (WIN32 AND NOT WTF_PLATFORM_WIN_CAIRO)
     13    set(ICU_INCLUDE_DIRS ${WEBKIT_LIBRARIES_INCLUDE_DIR})
    1514
    16         set(ICU_I18N_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuin${DEBUG_SUFFIX}.lib)
    17         set(ICU_UC_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuuc${DEBUG_SUFFIX}.lib)
     15    set(ICU_I18N_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuin${DEBUG_SUFFIX}.lib)
     16    set(ICU_UC_LIBRARY ${WEBKIT_LIBRARIES_LINK_DIR}/libicuuc${DEBUG_SUFFIX}.lib)
    1817
    19         # AppleWin does not provide a separate data library
    20         set(ICU_DATA_LIBRARY ${ICU_UC_LIBRARY})
     18    # AppleWin does not provide a separate data library
     19    set(ICU_DATA_LIBRARY ${ICU_UC_LIBRARY})
    2120
    22         set(ICU_LIBRARIES ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY})
    23     else ()
    24         message(FATAL_ERROR "Could not find ICU targets. Use find_package(ICU REQUIRED data i1n8 uc)")
    25     endif ()
     21    set(ICU_LIBRARIES ${ICU_I18N_LIBRARY} ${ICU_UC_LIBRARY})
     22else ()
     23    message(FATAL_ERROR "Could not find ICU targets. Use find_package(ICU REQUIRED data i1n8 uc)")
     24endif ()
    2625
    27     # Emulate ICU:: targets
    28     add_library(ICU::data UNKNOWN IMPORTED)
    29     set_target_properties(ICU::data PROPERTIES
    30         INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
    31         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
    32         IMPORTED_LOCATION "${ICU_DATA_LIBRARY}"
    33     )
     26# Emulate ICU:: targets
     27add_library(ICU::data UNKNOWN IMPORTED)
     28set_target_properties(ICU::data PROPERTIES
     29    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
     30    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
     31    IMPORTED_LOCATION "${ICU_DATA_LIBRARY}"
     32)
    3433
    35     add_library(ICU::i18n UNKNOWN IMPORTED)
    36     set_target_properties(ICU::i18n PROPERTIES
    37         INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
    38         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
    39         IMPORTED_LOCATION "${ICU_I18N_LIBRARY}"
    40     )
     34add_library(ICU::i18n UNKNOWN IMPORTED)
     35set_target_properties(ICU::i18n PROPERTIES
     36    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
     37    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
     38    IMPORTED_LOCATION "${ICU_I18N_LIBRARY}"
     39)
    4140
    42     add_library(ICU::uc UNKNOWN IMPORTED)
    43     set_target_properties(ICU::uc PROPERTIES
    44         INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
    45         IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
    46         IMPORTED_LOCATION "${ICU_UC_LIBRARY}"
    47     )
    48 endif ()
     41add_library(ICU::uc UNKNOWN IMPORTED)
     42set_target_properties(ICU::uc PROPERTIES
     43    INTERFACE_INCLUDE_DIRECTORIES "${ICU_INCLUDE_DIRS}"
     44    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
     45    IMPORTED_LOCATION "${ICU_UC_LIBRARY}"
     46)

  • trunk/Tools/TestWebKitAPI/PlatformMac.cmake

    r245492 r246126  
    3333    ${TESTWEBKITAPI_DIR}/mac/TestBrowsingContextLoadDelegate.mm
    3434)
     35
     36list(APPEND TestWebKitLegacy_SOURCES
     37    ${test_main_SOURCES}
     38)
Note: See TracChangeset for help on using the changeset viewer.