Fix the !ENABLE(BATTERY_STATUS) build
authordbatyai.u-szeged@partner.samsung.com <dbatyai.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Apr 2014 16:18:38 +0000 (16:18 +0000)
committerdbatyai.u-szeged@partner.samsung.com <dbatyai.u-szeged@partner.samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 1 Apr 2014 16:18:38 +0000 (16:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=130183

Reviewed by Anders Carlsson.

* Source/cmake/OptionsEfl.cmake:

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

ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/cmake/OptionsEfl.cmake

index 604f9fc..ae3493e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-04-01  Dániel Bátyai  <dbatyai.u-szeged@partner.samsung.com>
+
+        Fix the !ENABLE(BATTERY_STATUS) build
+        https://bugs.webkit.org/show_bug.cgi?id=130183
+
+        Reviewed by Anders Carlsson.
+
+        * Source/cmake/OptionsEfl.cmake:
+
 2014-03-31  Raphael Kubo da Costa  <raphael.kubo.da.costa@intel.com>
 
         [CMake][GTK] Do not expand variables twice in if() checks.
index 149d09b..21b5e54 100644 (file)
@@ -182,9 +182,13 @@ list(APPEND WebCore_SOURCES
     platform/text/enchant/TextCheckerEnchant.cpp
 )
 
-if (ENABLE_BATTERY_STATUS)
+if (ENABLE_BATTERY_STATUS OR (EFL_REQUIRED_VERSION VERSION_LESS 1.8))
     list(APPEND WebCore_INCLUDE_DIRECTORIES ${DBUS_INCLUDE_DIRS})
+    list(APPEND WebCore_INCLUDE_DIRECTORIES ${E_DBUS_INCLUDE_DIRS})
+    list(APPEND WebCore_INCLUDE_DIRECTORIES ${E_DBUS_EUKIT_INCLUDE_DIRS})
     list(APPEND WebCore_LIBRARIES ${DBUS_LIBRARIES})
+    list(APPEND WebCore_LIBRARIES ${E_DBUS_LIBRARIES})
+    list(APPEND WebCore_LIBRARIES ${E_DBUS_EUKIT_LIBRARIES})
 endif ()
 
 if (ENABLE_NETSCAPE_PLUGIN_API)
@@ -218,8 +222,6 @@ list(APPEND WebCore_LIBRARIES
     ${EINA_LIBRARIES}
     ${EO_LIBRARIES}
     ${EVAS_LIBRARIES}
-    ${E_DBUS_EUKIT_LIBRARIES}
-    ${E_DBUS_LIBRARIES}
     ${FONTCONFIG_LIBRARIES}
     ${FREETYPE2_LIBRARIES}
     ${GLIB_GIO_LIBRARIES}
@@ -242,8 +244,6 @@ list(APPEND WebCore_INCLUDE_DIRECTORIES
     ${ECORE_FILE_INCLUDE_DIRS}
     ${ECORE_X_INCLUDE_DIRS}
     ${EO_INCLUDE_DIRS}
-    ${E_DBUS_INCLUDE_DIRS}
-    ${E_DBUS_EUKIT_INCLUDE_DIRS}
     ${EDJE_INCLUDE_DIRS}
     ${EEZE_INCLUDE_DIRS}
     ${EINA_INCLUDE_DIRS}
index 58fd3f5..6fa659b 100644 (file)
@@ -169,7 +169,7 @@ if (ENABLE_WEBKIT2 AND ENABLE_NETSCAPE_PLUGIN_API)
     set(ENABLE_PLUGIN_PROCESS 1)
 endif ()
 
-if (ENABLE_BATTERY_STATUS)
+if (ENABLE_BATTERY_STATUS OR (EFL_REQUIRED_VERSION VERSION_LESS 1.8))
     find_package(DBus REQUIRED)
     find_package(E_DBus 1.7 COMPONENTS EUKit)
 endif ()