From 4412e77610275f2bc44db784c473ee92b05a7ede Mon Sep 17 00:00:00 2001 From: "ryuan.choi@samsung.com" Date: Tue, 26 Nov 2013 05:46:52 +0000 Subject: [PATCH] [EFL] E_DBus should be an optional https://bugs.webkit.org/show_bug.cgi?id=124881 Reviewed by Gyuyoung Kim. * Source/cmake/OptionsEfl.cmake: Checked E_DBus when only ENABLE_BATTERY_STATUS is on. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@159778 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- ChangeLog | 10 ++++++++++ Source/cmake/OptionsEfl.cmake | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 0ba3938..e5c94ec 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,15 @@ 2013-11-25 Ryuan Choi + [EFL] E_DBus should be an optional + https://bugs.webkit.org/show_bug.cgi?id=124881 + + Reviewed by Gyuyoung Kim. + + * Source/cmake/OptionsEfl.cmake: + Checked E_DBus when only ENABLE_BATTERY_STATUS is on. + +2013-11-25 Ryuan Choi + [EFL] Use Config mode of find_package for EFL 1.8 https://bugs.webkit.org/show_bug.cgi?id=124555 diff --git a/Source/cmake/OptionsEfl.cmake b/Source/cmake/OptionsEfl.cmake index 2713d9c..0c4a691 100644 --- a/Source/cmake/OptionsEfl.cmake +++ b/Source/cmake/OptionsEfl.cmake @@ -148,7 +148,6 @@ find_package(Edje ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE}) find_package(Eet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE}) find_package(Eeze ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE}) find_package(Efreet ${EFL_REQUIRED_VERSION} REQUIRED ${EFL_CONFIG_MODE}) -find_package(E_DBus 1.7 COMPONENTS EUKit) find_package(Freetype 2.4.2 REQUIRED) find_package(HarfBuzz 0.9.2 REQUIRED) @@ -165,6 +164,7 @@ endif () if (ENABLE_BATTERY_STATUS) find_package(DBus REQUIRED) + find_package(E_DBus 1.7 COMPONENTS EUKit) endif () if (ENABLE_VIDEO OR ENABLE_WEB_AUDIO) -- 1.8.3.1