From: jungmin76.park Date: Tue, 15 Oct 2013 10:52:51 +0000 (+0900) Subject: *fix compile error regarding pkgconfig. X-Git-Tag: accepted/tizen/20131018.123424~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=68025b95ab1edc93f81ebf8e9bb8d801264e4d8d;p=platform%2Fframework%2Fnative%2Fappwidget-service.git *fix compile error regarding pkgconfig. *Revert "remove useless include from spec file." This reverts commit 79be505051e0b6af37568fb983f9155a6c78dbb4. Change-Id: I2581b23414edc5e782d6b495281184cae21dfe88 Signed-off-by: jungmin76.park --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 7344b42..366f887 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,8 @@ SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/output") INCLUDE(FindPkgConfig) pkg_check_modules(${this_target} REQUIRED glib-2.0 + chromium + capi-appfw-application provider osp-appfw osp-appfw-server @@ -17,6 +19,7 @@ INCLUDE(FindPkgConfig) INCLUDE_DIRECTORIES ( + ${${this_target}_INCLUDE_DIRS} inc ) diff --git a/packaging/osp-appwidget-service.spec b/packaging/osp-appwidget-service.spec index 8c47f01..000f800 100755 --- a/packaging/osp-appwidget-service.spec +++ b/packaging/osp-appwidget-service.spec @@ -6,15 +6,12 @@ Group: System/Libraries License: Flora Source0: %{name}-%{version}.tar.gz BuildRequires: cmake +BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(chromium) BuildRequires: pkgconfig(capi-appfw-application) -BuildRequires: pkgconfig(aul) -BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(provider) BuildRequires: pkgconfig(osp-appfw) BuildRequires: pkgconfig(osp-appfw-server) -BuildRequires: pkgconfig(osp-uifw) -BuildRequires: pkgconfig(osp-image) BuildRequires: pkgconfig(osp-shell) BuildRequires: hash-signer diff --git a/src/FShell_AppContext.cpp b/src/FShell_AppContext.cpp index a8a6650..e30e2e0 100644 --- a/src/FShell_AppContext.cpp +++ b/src/FShell_AppContext.cpp @@ -286,7 +286,7 @@ result _AppContext::SendPendingEvent(void) { SetWaitingStatus(false); - TryReturn(__pPendingEventList->GetCount() > 0, E_DATA_NOT_FOUND, "No pending event."); + TryReturn(__pPendingEventList->GetCount() > 0, E_DATA_NOT_FOUND, "This context has no pending event. Please find next pending event context."); PendingEvent* pEvent = null; __pPendingEventList->GetAt(0, pEvent);