Changeset 144842 in webkit


Ignore:
Timestamp:
Mar 5, 2013 4:15:43 PM (11 years ago)
Author:
ryuan.choi@samsung.com
Message:

[EFL] Build break with latest EFL libraries
​https://bugs.webkit.org/show_bug.cgi?id=111028

Reviewed by Dirk Pranke.

.:

In latest EFL trunk, include path of ecore sub modules are changed from
ecore-1 to ecore-XXX-1.
So, this patch adds missing ECORE_XXX_INCLUDE_DIRS.

  • Source/cmake/FindEcore.cmake: Added additional path suffixes to find include directories of ecore-XXX
  • Source/cmake/FindElementary.cmake: Checked Ecore_Con dependency which Elementary requires.
  • Source/cmake/OptionsEfl.cmake: Made Imf and Imf_Evas mandatory.

Source/WebKit:

  • PlatformEfl.cmake: Added ECORE_X_INCLUDE_DIRS.

Source/WebKit2:

  • PlatformEfl.cmake: Added ECORE_XXX_INCLUDE_DIRS.

Source/WTF:

  • wtf/PlatformEfl.cmake: Added ECORE_IMF_INCLUDE_DIRS.

Tools:

  • MiniBrowser/efl/CMakeLists.txt: Added ECORE_XXX_INCLUDE_DIRS.
  • TestWebKitAPI/PlatformEfl.cmake: Ditto.
  • WebKitTestRunner/PlatformEfl.cmake: Ditto.
Location:
trunk
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r144841 r144842  
     12013-03-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries
     4        https://bugs.webkit.org/show_bug.cgi?id=111028
     5
     6        Reviewed by Dirk Pranke.
     7
     8        In latest EFL trunk, include path of ecore sub modules are changed from
     9        ecore-1 to ecore-XXX-1.
     10        So, this patch adds missing ECORE_XXX_INCLUDE_DIRS.
     11
     12        * Source/cmake/FindEcore.cmake: Added additional path suffixes to find include directories of ecore-XXX
     13        * Source/cmake/FindElementary.cmake: Checked Ecore_Con dependency which Elementary requires.
     14        * Source/cmake/OptionsEfl.cmake: Made Imf and Imf_Evas mandatory.
     15
    1162013-03-05  Shawn Singh  <shawnsingh@chromium.org>
    217

  • trunk/Source/WTF/ChangeLog

    r144811 r144842  
     12013-03-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries
     4        https://bugs.webkit.org/show_bug.cgi?id=111028
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * wtf/PlatformEfl.cmake: Added ECORE_IMF_INCLUDE_DIRS.
     9
    1102013-03-05  Csaba Osztrogonác  <ossy@webkit.org>
    211

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

    r138326 r144842  
    3030
    3131list(APPEND WTF_INCLUDE_DIRECTORIES
     32    ${ECORE_EVAS_INCLUDE_DIRS}
    3233    ${ECORE_INCLUDE_DIRS}
    33     ${ECORE_EVAS_INCLUDE_DIRS}
     34    ${ECORE_IMF_INCLUDE_DIRS}
    3435    ${EINA_INCLUDE_DIRS}
    3536    ${EO_INCLUDE_DIRS}

  • trunk/Source/WebKit/ChangeLog

    r144663 r144842  
     12013-03-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries
     4        https://bugs.webkit.org/show_bug.cgi?id=111028
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * PlatformEfl.cmake: Added ECORE_X_INCLUDE_DIRS.
     9
    1102013-03-04  Roger Fong  <roger_fong@apple.com>
    211

  • trunk/Source/WebKit/PlatformEfl.cmake

    r141439 r144842  
    1515    ${ECORE_INCLUDE_DIRS}
    1616    ${ECORE_INPUT_INCLUDE_DIRS}
     17    ${ECORE_X_INCLUDE_DIRS}
    1718    ${EDJE_INCLUDE_DIRS}
    1819    ${EFREET_INCLUDE_DIRS}

  • trunk/Source/WebKit2/ChangeLog

    r144838 r144842  
     12013-03-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries
     4        https://bugs.webkit.org/show_bug.cgi?id=111028
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * PlatformEfl.cmake: Added ECORE_XXX_INCLUDE_DIRS.
     9
    1102013-03-05  Anders Carlsson  <andersca@apple.com>
    211

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r143275 r144842  
    185185    "${WTF_DIR}/wtf/gobject"
    186186    ${CAIRO_INCLUDE_DIRS}
     187    ${ECORE_EVAS_INCLUDE_DIRS}
     188    ${ECORE_IMF_EVAS_INCLUDE_DIRS}
     189    ${ECORE_IMF_INCLUDE_DIRS}
    187190    ${ECORE_INCLUDE_DIRS}
    188     ${ECORE_EVAS_INCLUDE_DIRS}
     191    ${ECORE_X_INCLUDE_DIRS}
    189192    ${EDJE_INCLUDE_DIRS}
    190193    ${EFREET_INCLUDE_DIRS}

  • trunk/Source/cmake/FindEcore.cmake

    r137969 r144842  
    4848
    4949# Components.
     50# Since EFL version 1.8, include path of Ecore sub modules have been changed
     51# from ecore-1 to ecore-XXX-1
    5052FIND_EFL_LIBRARY(ECORE_EVAS
    5153    HEADERS Ecore_Evas.h
    52     HEADER_PREFIXES ecore-1
     54    HEADER_PREFIXES ecore-1 ecore-evas-1
    5355    LIBRARY ecore_evas
    5456)
    5557FIND_EFL_LIBRARY(ECORE_FILE
    5658    HEADERS Ecore_File.h
    57     HEADER_PREFIXES ecore-1
     59    HEADER_PREFIXES ecore-1 ecore-file-1
    5860    LIBRARY ecore_file
    5961)
    6062FIND_EFL_LIBRARY(ECORE_INPUT
    6163    HEADERS Ecore_Input.h
    62     HEADER_PREFIXES ecore-1
     64    HEADER_PREFIXES ecore-1 ecore-input-1
    6365    LIBRARY ecore_input
    6466)
    6567FIND_EFL_LIBRARY(ECORE_X
    6668    HEADERS Ecore_X.h
    67     HEADER_PREFIXES ecore-1
     69    HEADER_PREFIXES ecore-1 ecore-x-1
    6870    LIBRARY ecore_x
    6971)
    7072FIND_EFL_LIBRARY(ECORE_IMF
    7173    HEADERS Ecore_IMF.h
    72     HEADER_PREFIXES ecore-1
     74    HEADER_PREFIXES ecore-1 ecore-imf-1
    7375    LIBRARY ecore_imf
    7476)
    7577FIND_EFL_LIBRARY(ECORE_IMF_EVAS
    7678    HEADERS Ecore_IMF_Evas.h
    77     HEADER_PREFIXES ecore-1
     79    HEADER_PREFIXES ecore-1 ecore-imf-evas-1
    7880    LIBRARY ecore_imf_evas
    7981)

  • trunk/Source/cmake/FindElementary.cmake

    r136790 r144842  
    3737)
    3838
     39# Ecore_Con is required by not WebKit/Efl but Elementary.
     40FIND_EFL_LIBRARY(ECORE_CON
     41    HEADERS Ecore_Con.h
     42    HEADER_PREFIXES ecore-1 ecore-con-1
     43    LIBRARY ecore_con
     44)
     45
    3946include(FindPackageHandleStandardArgs)
    40 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Elementary REQUIRED_VARS ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARIES
     47FIND_PACKAGE_HANDLE_STANDARD_ARGS(Elementary REQUIRED_VARS ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARIES ECORE_CON_INCLUDE_DIRS ECORE_CON_LIBRARIES
    4148                                             VERSION_VAR   ELM_VERSION)

  • trunk/Source/cmake/OptionsEfl.cmake

    r144602 r144842  
    118118find_package(Eina 1.6 REQUIRED)
    119119find_package(Evas 1.6 REQUIRED)
    120 find_package(Ecore 1.6 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
     120find_package(Ecore 1.6 COMPONENTS Evas File Input Imf Imf_Evas ${ECORE_ADDITIONAL_COMPONENTS})
    121121find_package(Edje 1.6 REQUIRED)
    122122find_package(Eet 1.6 REQUIRED)

  • trunk/Tools/ChangeLog

    r144840 r144842  
     12013-03-05  Ryuan Choi  <ryuan.choi@samsung.com>
     2
     3        [EFL] Build break with latest EFL libraries
     4        https://bugs.webkit.org/show_bug.cgi?id=111028
     5
     6        Reviewed by Dirk Pranke.
     7
     8        * MiniBrowser/efl/CMakeLists.txt: Added ECORE_XXX_INCLUDE_DIRS.
     9        * TestWebKitAPI/PlatformEfl.cmake: Ditto.
     10        * WebKitTestRunner/PlatformEfl.cmake: Ditto.
     11
    1122013-03-05  Roger Fong  <roger_fong@apple.com>
    213

  • trunk/Tools/MiniBrowser/efl/CMakeLists.txt

    r138326 r144842  
    1313    ${ECORE_INCLUDE_DIRS}
    1414    ${ECORE_EVAS_INCLUDE_DIRS}
     15    ${ECORE_CON_INCLUDE_DIRS}
    1516    ${ECORE_FILE_INCLUDE_DIRS}
     17    ${ECORE_IMF_INCLUDE_DIRS}
     18    ${ECORE_INPUT_INCLUDE_DIRS}
    1619    ${EDJE_INCLUDE_DIRS}
    1720    ${EET_INCLUDE_DIRS}

  • trunk/Tools/TestWebKitAPI/PlatformEfl.cmake

    r144664 r144842  
    1515    ${WEBKIT2_DIR}/UIProcess/API/C/efl
    1616    ${WEBKIT2_DIR}/UIProcess/API/efl
     17    ${ECORE_EVAS_INCLUDE_DIRS}
    1718    ${ECORE_INCLUDE_DIRS}
    1819    ${EINA_INCLUDE_DIRS}

  • trunk/Tools/WebKitTestRunner/PlatformEfl.cmake

    r138326 r144842  
    2323    "${WTF_DIR}/wtf/gobject"
    2424    ${CAIRO_INCLUDE_DIRS}
     25    ${ECORE_EVAS_INCLUDE_DIRS}
     26    ${ECORE_FILE_INCLUDE_DIRS}
    2527    ${ECORE_INCLUDE_DIRS}
    26     ${ECORE_EVAS_INCLUDE_DIRS}
    2728    ${EINA_INCLUDE_DIRS}
    2829    ${EO_INCLUDE_DIRS}
Note: See TracChangeset for help on using the changeset viewer.