Skip to content

W
webkit
Commit 927e74f7 authored by ryuan.choi@samsung.com's avatar ryuan.choi@samsung.com
Browse files
Options

[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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@144842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 3142b7d0
Hide whitespace changes
Inline Side-by-side
Showing with 83 additions and 11 deletions
ChangeLog
View file @ 927e74f7
2013-03-05 Ryuan Choi <ryuan.choi@samsung.com>
[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.
2013-03-05 Shawn Singh <shawnsingh@chromium.org>
Fix default background of a dragged image.
......
Source/WTF/ChangeLog
View file @ 927e74f7
2013-03-05 Ryuan Choi <ryuan.choi@samsung.com>
[EFL] Build break with latest EFL libraries
https://bugs.webkit.org/show_bug.cgi?id=111028
Reviewed by Dirk Pranke.
* wtf/PlatformEfl.cmake: Added ECORE_IMF_INCLUDE_DIRS.
2013-03-05 Csaba Osztrogonác <ossy@webkit.org>
Fix cast-align warning in ASCIIFastPath.h on ARM
......
Source/WTF/wtf/PlatformEfl.cmake
View file @ 927e74f7
......@@ -29,8 +29,9 @@ list(APPEND WTF_LIBRARIES
)
list(APPEND WTF_INCLUDE_DIRECTORIES
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_IMF_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
......
Source/WebKit/ChangeLog
View file @ 927e74f7
2013-03-05 Ryuan Choi <ryuan.choi@samsung.com>
[EFL] Build break with latest EFL libraries
https://bugs.webkit.org/show_bug.cgi?id=111028
Reviewed by Dirk Pranke.
* PlatformEfl.cmake: Added ECORE_X_INCLUDE_DIRS.
2013-03-04 Roger Fong <roger_fong@apple.com>
Unreviewed. AppleWin build fix.
......
Source/WebKit/PlatformEfl.cmake
View file @ 927e74f7
......@@ -14,6 +14,7 @@ list(APPEND WebKit_INCLUDE_DIRECTORIES
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_INPUT_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${EFREET_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
......
Source/WebKit2/ChangeLog
View file @ 927e74f7
2013-03-05 Ryuan Choi <ryuan.choi@samsung.com>
[EFL] Build break with latest EFL libraries
https://bugs.webkit.org/show_bug.cgi?id=111028
Reviewed by Dirk Pranke.
* PlatformEfl.cmake: Added ECORE_XXX_INCLUDE_DIRS.
2013-03-05 Anders Carlsson <andersca@apple.com>
Use a named parameter for whether a quota error ocurred or not
Source/WebKit2/PlatformEfl.cmake
View file @ 927e74f7
......@@ -184,8 +184,11 @@ list(APPEND WebKit2_INCLUDE_DIRECTORIES
"${WTF_DIR}/wtf/efl/"
"${WTF_DIR}/wtf/gobject"
${CAIRO_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_IMF_EVAS_INCLUDE_DIRS}
${ECORE_IMF_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_X_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${EFREET_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
......
Source/cmake/FindEcore.cmake
View file @ 927e74f7
......@@ -47,34 +47,36 @@ FIND_EFL_LIBRARY(ECORE
)
# Components.
# Since EFL version 1.8, include path of Ecore sub modules have been changed
# from ecore-1 to ecore-XXX-1
FIND_EFL_LIBRARY(ECORE_EVAS
HEADERS Ecore_Evas.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-evas-1
LIBRARY ecore_evas
)
FIND_EFL_LIBRARY(ECORE_FILE
HEADERS Ecore_File.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-file-1
LIBRARY ecore_file
)
FIND_EFL_LIBRARY(ECORE_INPUT
HEADERS Ecore_Input.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-input-1
LIBRARY ecore_input
)
FIND_EFL_LIBRARY(ECORE_X
HEADERS Ecore_X.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-x-1
LIBRARY ecore_x
)
FIND_EFL_LIBRARY(ECORE_IMF
HEADERS Ecore_IMF.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-imf-1
LIBRARY ecore_imf
)
FIND_EFL_LIBRARY(ECORE_IMF_EVAS
HEADERS Ecore_IMF_Evas.h
HEADER_PREFIXES ecore-1
HEADER_PREFIXES ecore-1 ecore-imf-evas-1
LIBRARY ecore_imf_evas
)
......
Source/cmake/FindElementary.cmake
View file @ 927e74f7
......@@ -36,6 +36,13 @@ FIND_EFL_LIBRARY(ELEMENTARY
LIBRARY elementary
)
# Ecore_Con is required by not WebKit/Efl but Elementary.
FIND_EFL_LIBRARY(ECORE_CON
HEADERS Ecore_Con.h
HEADER_PREFIXES ecore-1 ecore-con-1
LIBRARY ecore_con
)
include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Elementary REQUIRED_VARS ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARIES
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Elementary REQUIRED_VARS ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARIES ECORE_CON_INCLUDE_DIRS ECORE_CON_LIBRARIES
VERSION_VAR ELM_VERSION)
Source/cmake/OptionsEfl.cmake
View file @ 927e74f7
......@@ -117,7 +117,7 @@ endif ()
# Allow building the EFL port using EFL version 1.6+ to build on Tizen trunk
find_package(Eina 1.6 REQUIRED)
find_package(Evas 1.6 REQUIRED)
find_package(Ecore 1.6 COMPONENTS Evas File Input ${ECORE_ADDITIONAL_COMPONENTS})
find_package(Ecore 1.6 COMPONENTS Evas File Input Imf Imf_Evas ${ECORE_ADDITIONAL_COMPONENTS})
find_package(Edje 1.6 REQUIRED)
find_package(Eet 1.6 REQUIRED)
find_package(Eeze 1.6 REQUIRED)
......
Tools/ChangeLog
View file @ 927e74f7
2013-03-05 Ryuan Choi <ryuan.choi@samsung.com>
[EFL] Build break with latest EFL libraries
https://bugs.webkit.org/show_bug.cgi?id=111028
Reviewed by Dirk Pranke.
* MiniBrowser/efl/CMakeLists.txt: Added ECORE_XXX_INCLUDE_DIRS.
* TestWebKitAPI/PlatformEfl.cmake: Ditto.
* WebKitTestRunner/PlatformEfl.cmake: Ditto.
2013-03-05 Roger Fong <roger_fong@apple.com>
Increase number of WinEWS iterations to 20.
Tools/MiniBrowser/efl/CMakeLists.txt
View file @ 927e74f7
......@@ -12,7 +12,10 @@ set(MiniBrowser_INCLUDE_DIRECTORIES
${CAIRO_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_CON_INCLUDE_DIRS}
${ECORE_FILE_INCLUDE_DIRS}
${ECORE_IMF_INCLUDE_DIRS}
${ECORE_INPUT_INCLUDE_DIRS}
${EDJE_INCLUDE_DIRS}
${EET_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
......
Tools/TestWebKitAPI/PlatformEfl.cmake
View file @ 927e74f7
......@@ -14,6 +14,7 @@ include_directories(
${WEBKIT2_DIR}/UIProcess/API/C/soup
${WEBKIT2_DIR}/UIProcess/API/C/efl
${WEBKIT2_DIR}/UIProcess/API/efl
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
......
Tools/WebKitTestRunner/PlatformEfl.cmake
View file @ 927e74f7
......@@ -22,8 +22,9 @@ list(APPEND WebKitTestRunner_INCLUDE_DIRECTORIES
${WEBKIT2_DIR}/UIProcess/API/efl
"${WTF_DIR}/wtf/gobject"
${CAIRO_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${ECORE_EVAS_INCLUDE_DIRS}
${ECORE_FILE_INCLUDE_DIRS}
${ECORE_INCLUDE_DIRS}
${EINA_INCLUDE_DIRS}
${EO_INCLUDE_DIRS}
${EVAS_INCLUDE_DIRS}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment