Changeset 206153 in webkit


Ignore:
Timestamp:
Sep 20, 2016 11:07:48 AM (8 years ago)
Author:
commit-queue@webkit.org
Message:

[WinCairo] Use find_package cairo in build
​https://bugs.webkit.org/show_bug.cgi?id=162239

Patch by Don Olmstead <​don.olmstead@am.sony.com> on 2016-09-20
Reviewed by Alex Christensen.

.:

  • Source/cmake/FindCairo.cmake:
  • Source/cmake/OptionsWinCairo.cmake:

Source/WebCore:

No new tests. No change in behavior.

  • PlatformWinCairo.cmake:

Source/WebKit:

  • PlatformWin.cmake:

Tools:

  • DumpRenderTree/PlatformWin.cmake:
  • TestWebKitAPI/PlatformWin.cmake:
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r206119 r206153  
     12016-09-20  Don Olmstead  <don.olmstead@am.sony.com>
     2
     3        [WinCairo] Use find_package cairo in build
     4        https://bugs.webkit.org/show_bug.cgi?id=162239
     5
     6        Reviewed by Alex Christensen.
     7
     8        * Source/cmake/FindCairo.cmake:
     9        * Source/cmake/OptionsWinCairo.cmake:
     10
    1112016-09-19  Daniel Bates  <dabates@apple.com>
    212

  • trunk/Source/WebCore/ChangeLog

    r206146 r206153  
     12016-09-20  Don Olmstead  <don.olmstead@am.sony.com>
     2
     3        [WinCairo] Use find_package cairo in build
     4        https://bugs.webkit.org/show_bug.cgi?id=162239
     5
     6        Reviewed by Alex Christensen.
     7
     8        No new tests. No change in behavior.
     9
     10        * PlatformWinCairo.cmake:
     11
    1122016-09-20  Jer Noble  <jer.noble@apple.com>
    213

  • trunk/Source/WebCore/PlatformWinCairo.cmake

    r205841 r206153  
    33
    44list(APPEND WebCore_INCLUDE_DIRECTORIES
     5    ${CAIRO_INCLUDE_DIRS}
    56    "${DERIVED_SOURCES_DIR}/ForwardingHeaders/JavaScriptCore"
    67    "${DirectX_INCLUDE_DIRS}"
    78    "${WEBKIT_LIBRARIES_DIR}/include"
    8     "${WEBKIT_LIBRARIES_DIR}/include/cairo"
    99    "${WEBKIT_LIBRARIES_DIR}/include/SQLite"
    1010    "${WEBKIT_LIBRARIES_DIR}/include/zlib"
    … …  
    7575
    7676list(APPEND WebCore_LIBRARIES
     77    ${CAIRO_LIBRARIES}
    7778    ${DirectX_LIBRARIES}
    7879    CFLite
    7980    SQLite3
    80     cairo
    8181    comctl32
    8282    crypt32
    … …  
    9797
    9898list(APPEND WebCoreTestSupport_LIBRARIES
     99    ${CAIRO_LIBRARIES}
    99100    CFLite
    100     cairo
    101101    shlwapi
    102102)

  • trunk/Source/WebKit/ChangeLog

    r205871 r206153  
     12016-09-20  Don Olmstead  <don.olmstead@am.sony.com>
     2
     3        [WinCairo] Use find_package cairo in build
     4        https://bugs.webkit.org/show_bug.cgi?id=162239
     5
     6        Reviewed by Alex Christensen.
     7
     8        * PlatformWin.cmake:
     9
    1102016-09-12  Brent Fulgham  <bfulgham@apple.com>
    211

  • trunk/Source/WebKit/PlatformWin.cmake

    r205871 r206153  
    22    add_definitions(-DUSE_CAIRO=1 -DUSE_CURL=1 -DWEBKIT_EXPORTS=1)
    33    list(APPEND WebKit_INCLUDE_DIRECTORIES
     4        ${CAIRO_INCLUDE_DIRS}
    45        "${WEBKIT_LIBRARIES_DIR}/include"
    5         "${WEBKIT_LIBRARIES_DIR}/include/cairo"
    66        "${WEBKIT_LIBRARIES_DIR}/include/sqlite"
    77        "${WEBCORE_DIR}/platform/graphics/cairo"

  • trunk/Source/cmake/FindCairo.cmake

    r161922 r206153  
    3636    HINTS ${PC_CAIRO_INCLUDEDIR}
    3737          ${PC_CAIRO_INCLUDE_DIRS}
     38          ${WEBKIT_LIBRARIES_INCLUDE_DIR}/cairo
    3839    PATH_SUFFIXES cairo
    3940)
    … …  
    4344    HINTS ${PC_CAIRO_LIBDIR}
    4445          ${PC_CAIRO_LIBRARY_DIRS}
     46          ${WEBKIT_LIBRARIES_LINK_DIR}
    4547)
    4648

  • trunk/Source/cmake/OptionsWinCairo.cmake

    r196429 r206153  
    22
    33include(OptionsWin)
     4
     5find_package(Cairo 1.14.4 REQUIRED)
    46
    57set(USE_CF 1)

  • trunk/Tools/ChangeLog

    r206150 r206153  
     12016-09-20  Don Olmstead  <don.olmstead@am.sony.com>
     2
     3        [WinCairo] Use find_package cairo in build
     4        https://bugs.webkit.org/show_bug.cgi?id=162239
     5
     6        Reviewed by Alex Christensen.
     7
     8        * DumpRenderTree/PlatformWin.cmake:
     9        * TestWebKitAPI/PlatformWin.cmake:
     10
    1112016-09-20  Wenson Hsieh  <wenson_hsieh@apple.com>
    212

  • trunk/Tools/DumpRenderTree/PlatformWin.cmake

    r204592 r206153  
    9696    list(APPEND DumpRenderTree_INCLUDE_DIRECTORIES
    9797        cairo
    98         "${WEBKIT_LIBRARIES_DIR}/include/cairo"
     98        ${CAIRO_INCLUDE_DIRS}
    9999    )
    100100    list(APPEND DumpRenderTreeLib_SOURCES
    … …  
    105105    )
    106106    list(APPEND ImageDiff_LIBRARIES
    107         cairo
     107        ${CAIRO_LIBRARIES}
    108108    )
    109109else ()

  • trunk/Tools/TestWebKitAPI/PlatformWin.cmake

    r205871 r206153  
    6565if (${WTF_PLATFORM_WIN_CAIRO})
    6666    list(APPEND test_webcore_LIBRARIES
    67         cairo
     67        ${CAIRO_LIBRARIES}
    6868        libANGLE
    6969        libeay32
    … …  
    128128set_tests_properties(TestWebCore PROPERTIES TIMEOUT 60)
    129129
     130if (${WTF_PLATFORM_WIN_CAIRO})
     131    include_directories(
     132        ${CAIRO_INCLUDE_DIRS}
     133    )
     134endif ()
     135
    130136add_library(TestWebKitLib SHARED
    131137    ${test_main_SOURCES}
Note: See TracChangeset for help on using the changeset viewer.