[EFL] Fix link error caused by not directly linking with edbus

https://bugs.webkit.org/show_bug.cgi?id=86747

Unreviewed build fix.

Patch by Thiago Marcos P. Santos <thiago.santos@intel.com> on 2012-05-17

.:

* Source/cmake/FindEFL.cmake:

Source/WebKit:

* PlatformEfl.cmake:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@117459 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 8ddaf72..51df024 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-17  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [EFL] Fix link error caused by not directly linking with edbus
+        https://bugs.webkit.org/show_bug.cgi?id=86747
+
+        Unreviewed build fix.
+
+        * Source/cmake/FindEFL.cmake:
+
 2012-05-17  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Convert setDomainRelaxationForbiddenForURLScheme to use InternalSettings interface

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 0a3eab0..5745757 100644 (file)
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2012-05-17  Thiago Marcos P. Santos  <thiago.santos@intel.com>
+
+        [EFL] Fix link error caused by not directly linking with edbus
+        https://bugs.webkit.org/show_bug.cgi?id=86747
+
+        Unreviewed build fix.
+
+        * PlatformEfl.cmake:
+
 2012-05-16  Kihong Kwon  <kihong.kwon@samsung.com>
 
         [EFL] Support for Battery Status API on the WebKit-Efl

diff --git a/Source/WebKit/PlatformEfl.cmake b/Source/WebKit/PlatformEfl.cmake
index 849954e..6631681 100644 (file)
--- a/Source/WebKit/PlatformEfl.cmake
+++ b/Source/WebKit/PlatformEfl.cmake
@@ -20,6 +20,7 @@ LIST(APPEND WebKit_INCLUDE_DIRECTORIES
     ${EFLDEPS_INCLUDE_DIRS}
     ${EVAS_INCLUDE_DIRS}
     ${EUKIT_INCLUDE_DIRS}
+    ${EDBUS_INCLUDE_DIRS}
     ${LIBXML2_INCLUDE_DIR}
     ${LIBXSLT_INCLUDE_DIR}
     ${SQLITE_INCLUDE_DIR}
@@ -126,6 +127,7 @@ LIST(APPEND WebKit_LIBRARIES
     ${ECORE_X_LIBRARIES}
     ${EFLDEPS_LIBRARIES}
     ${EUKIT_LIBRARIES}
+    ${EDBUS_LIBRARIES}
     ${FREETYPE_LIBRARIES}
     ${LIBXML2_LIBRARIES}
     ${SQLITE_LIBRARIES}

diff --git a/Source/cmake/FindEFL.cmake b/Source/cmake/FindEFL.cmake
index 04f5588..8c9b566 100644 (file)
--- a/Source/cmake/FindEFL.cmake
+++ b/Source/cmake/FindEFL.cmake
@@ -10,11 +10,13 @@ PKG_CHECK_MODULES (EFLDEPS REQUIRED
   ecore-file>=1.0.0
   ecore-evas>=1.0.999.59763
   edje>=1.0.0
-  eukit>=1.1.0)
+  eukit>=1.1.0
+  edbus>=1.1.0)
 PKG_CHECK_MODULES (EINA REQUIRED eina>=1.0.0)
 PKG_CHECK_MODULES (ECORE_X ecore-x>=1.0.0)
 PKG_CHECK_MODULES (EVAS REQUIRED evas>=1.0.0)
 PKG_CHECK_MODULES (EUKIT REQUIRED eukit>=1.1.0)
+PKG_CHECK_MODULES (EDBUS REQUIRED edbus>=1.1.0)
 
 FIND_PROGRAM (EDJE_CC_EXECUTABLE edje_cc)
 IF (NOT EDJE_CC_EXECUTABLE)