commit 927e74f7a9e67dfd44ad35e91d644b106c435787
author ryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 06 00:15:43 2013 +0000
committer ryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 06 00:15:43 2013 +0000
tree 1202107f4920fbdb68bea38208c753e91bea7569
parent 3142b7d0302c67c0009a0ef4de61e248a485067c

[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

Source/WebKit2/PlatformEfl.cmake

diff --git a/Source/WebKit2/PlatformEfl.cmake b/Source/WebKit2/PlatformEfl.cmake
index 7fa4ec9..8f6b9ba 100644
--- a/Source/WebKit2/PlatformEfl.cmake
+++ b/Source/WebKit2/PlatformEfl.cmake
@@ -184,8 +184,11 @@
     "${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}