Title: [125924] trunk
- Revision
- 125924
- Author
- rak...@webkit.org
- Date
- 2012-08-17 12:12:16 -0700 (Fri, 17 Aug 2012)
Log Message
[CMake] Add FindDBus.cmake and use it in the EFL port.
https://bugs.webkit.org/show_bug.cgi?id=94319
Reviewed by Daniel Bates.
.:
Currently, the Battery Status-related code in the EFL port uses
libdbus but does not directly include its directories or link
against it, relying instead on the compiler flags coming via
EDbus's pkg-config information.
That will break once we stop obtaining EFL's include directories
and library paths from pkg-config, so write FindDBus.cmake to
prepare for that.
* Source/cmake/FindDBus.cmake: Added.
* Source/cmake/OptionsEfl.cmake: Look for D-Bus if BATTERY_STATUS
support is enabled.
Source/WebCore:
* PlatformEfl.cmake: Link against DBUS_LIBRARIES and add
DBUS_INCLUDE_DIRS to the include path list if BATTERY_STATUS
support is enabled.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (125923 => 125924)
--- trunk/ChangeLog 2012-08-17 19:01:38 UTC (rev 125923)
+++ trunk/ChangeLog 2012-08-17 19:12:16 UTC (rev 125924)
@@ -1,3 +1,23 @@
+2012-08-17 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [CMake] Add FindDBus.cmake and use it in the EFL port.
+ https://bugs.webkit.org/show_bug.cgi?id=94319
+
+ Reviewed by Daniel Bates.
+
+ Currently, the Battery Status-related code in the EFL port uses
+ libdbus but does not directly include its directories or link
+ against it, relying instead on the compiler flags coming via
+ EDbus's pkg-config information.
+
+ That will break once we stop obtaining EFL's include directories
+ and library paths from pkg-config, so write FindDBus.cmake to
+ prepare for that.
+
+ * Source/cmake/FindDBus.cmake: Added.
+ * Source/cmake/OptionsEfl.cmake: Look for D-Bus if BATTERY_STATUS
+ support is enabled.
+
2012-08-17 Rob Buis <rb...@rim.com>
[BlackBerry] Remove some shared libraries from linking
Modified: trunk/Source/WebCore/ChangeLog (125923 => 125924)
--- trunk/Source/WebCore/ChangeLog 2012-08-17 19:01:38 UTC (rev 125923)
+++ trunk/Source/WebCore/ChangeLog 2012-08-17 19:12:16 UTC (rev 125924)
@@ -1,3 +1,14 @@
+2012-08-17 Raphael Kubo da Costa <rak...@webkit.org>
+
+ [CMake] Add FindDBus.cmake and use it in the EFL port.
+ https://bugs.webkit.org/show_bug.cgi?id=94319
+
+ Reviewed by Daniel Bates.
+
+ * PlatformEfl.cmake: Link against DBUS_LIBRARIES and add
+ DBUS_INCLUDE_DIRS to the include path list if BATTERY_STATUS
+ support is enabled.
+
2012-08-17 Pavel Feldman <pfeld...@chromium.org>
Web Inspector: make profiles panel a lazily loaded module.
Modified: trunk/Source/WebCore/PlatformEfl.cmake (125923 => 125924)
--- trunk/Source/WebCore/PlatformEfl.cmake 2012-08-17 19:01:38 UTC (rev 125923)
+++ trunk/Source/WebCore/PlatformEfl.cmake 2012-08-17 19:12:16 UTC (rev 125924)
@@ -93,6 +93,11 @@
platform/text/efl/TextBreakIteratorInternalICUEfl.cpp
)
+IF (ENABLE_BATTERY_STATUS)
+ LIST(APPEND WebCore_INCLUDE_DIRECTORIES ${DBUS_INCLUDE_DIRS})
+ LIST(APPEND WebCore_LIBRARIES ${DBUS_LIBRARIES})
+ENDIF ()
+
IF (ENABLE_NETSCAPE_PLUGIN_API)
LIST(APPEND WebCore_SOURCES
plugins/PluginDatabase.cpp
Added: trunk/Source/cmake/FindDBus.cmake (0 => 125924)
--- trunk/Source/cmake/FindDBus.cmake (rev 0)
+++ trunk/Source/cmake/FindDBus.cmake 2012-08-17 19:12:16 UTC (rev 125924)
@@ -0,0 +1,59 @@
+# - Try to find DBus
+# Once done, this will define
+#
+# DBUS_FOUND - system has DBus
+# DBUS_INCLUDE_DIRS - the DBus include directories
+# DBUS_LIBRARIES - link these to use DBus
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rak...@webkit.org>
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+FIND_PACKAGE(PkgConfig)
+PKG_CHECK_MODULES(PC_DBUS QUIET dbus-1)
+
+FIND_LIBRARY(DBUS_LIBRARIES
+ NAMES dbus-1
+ HINTS ${PC_DBUS_LIBDIR}
+ ${PC_DBUS_LIBRARY_DIRS}
+)
+
+FIND_PATH(DBUS_INCLUDE_DIR
+ NAMES dbus/dbus.h
+ HINTS ${PC_DBUS_INCLUDEDIR}
+ ${PC_DBUS_INCLUDE_DIRS}
+)
+
+GET_FILENAME_COMPONENT(_DBUS_LIBRARY_DIR ${DBUS_LIBRARIES} PATH)
+FIND_PATH(DBUS_ARCH_INCLUDE_DIR
+ NAMES dbus/dbus-arch-deps.h
+ HINTS ${PC_DBUS_INCLUDEDIR}
+ ${PC_DBUS_INCLUDE_DIRS}
+ ${_DBUS_LIBRARY_DIR}
+ ${DBUS_INCLUDE_DIR}
+ PATH_SUFFIXES include
+)
+
+SET(DBUS_INCLUDE_DIRS ${DBUS_INCLUDE_DIR} ${DBUS_ARCH_INCLUDE_DIR})
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(DBUS REQUIRED_VARS DBUS_INCLUDE_DIRS DBUS_LIBRARIES)
Modified: trunk/Source/cmake/OptionsEfl.cmake (125923 => 125924)
--- trunk/Source/cmake/OptionsEfl.cmake 2012-08-17 19:01:38 UTC (rev 125923)
+++ trunk/Source/cmake/OptionsEfl.cmake 2012-08-17 19:12:16 UTC (rev 125924)
@@ -136,6 +136,10 @@
SET(ENABLE_SVG_FONTS 0)
ENDIF ()
+IF (ENABLE_BATTERY_STATUS)
+ FIND_PACKAGE(DBus REQUIRED)
+ENDIF ()
+
IF (ENABLE_VIDEO OR ENABLE_WEB_AUDIO)
SET(GSTREAMER_COMPONENTS app interfaces pbutils)
SET(WTF_USE_GSTREAMER 1)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
