Title: [117459] trunk
- Revision
- 117459
- Author
- commit-qu...@webkit.org
- Date
- 2012-05-17 10:25:58 -0700 (Thu, 17 May 2012)
Log Message
[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.san...@intel.com> on 2012-05-17
.:
* Source/cmake/FindEFL.cmake:
Source/WebKit:
* PlatformEfl.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (117458 => 117459)
--- trunk/ChangeLog 2012-05-17 17:20:07 UTC (rev 117458)
+++ trunk/ChangeLog 2012-05-17 17:25:58 UTC (rev 117459)
@@ -1,3 +1,12 @@
+2012-05-17 Thiago Marcos P. Santos <thiago.san...@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....@samsung.com>
Convert setDomainRelaxationForbiddenForURLScheme to use InternalSettings interface
Modified: trunk/Source/WebKit/ChangeLog (117458 => 117459)
--- trunk/Source/WebKit/ChangeLog 2012-05-17 17:20:07 UTC (rev 117458)
+++ trunk/Source/WebKit/ChangeLog 2012-05-17 17:25:58 UTC (rev 117459)
@@ -1,3 +1,12 @@
+2012-05-17 Thiago Marcos P. Santos <thiago.san...@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.k...@samsung.com>
[EFL] Support for Battery Status API on the WebKit-Efl
Modified: trunk/Source/WebKit/PlatformEfl.cmake (117458 => 117459)
--- trunk/Source/WebKit/PlatformEfl.cmake 2012-05-17 17:20:07 UTC (rev 117458)
+++ trunk/Source/WebKit/PlatformEfl.cmake 2012-05-17 17:25:58 UTC (rev 117459)
@@ -20,6 +20,7 @@
${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 @@
${ECORE_X_LIBRARIES}
${EFLDEPS_LIBRARIES}
${EUKIT_LIBRARIES}
+ ${EDBUS_LIBRARIES}
${FREETYPE_LIBRARIES}
${LIBXML2_LIBRARIES}
${SQLITE_LIBRARIES}
Modified: trunk/Source/cmake/FindEFL.cmake (117458 => 117459)
--- trunk/Source/cmake/FindEFL.cmake 2012-05-17 17:20:07 UTC (rev 117458)
+++ trunk/Source/cmake/FindEFL.cmake 2012-05-17 17:25:58 UTC (rev 117459)
@@ -10,11 +10,13 @@
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)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes