From 4db12ef5447bc8fc4596131e305509b47afcccde Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Mon, 9 Jul 2018 14:21:01 +0900 Subject: [PATCH] Revert "[Tizen] Change dependency" This reverts commit 8925723e07b479e49bfb01828217007ad90ce7e9. --- build/tizen/CMakeLists.txt | 2 +- packaging/com.samsung.dali-demo.spec | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt index 70706fe..a31ac18 100644 --- a/build/tizen/CMakeLists.txt +++ b/build/tizen/CMakeLists.txt @@ -135,7 +135,7 @@ MESSAGE("Installed style resources ${LOCAL_STYLE_IMAGES_LIST} to ${STYLE_DIR}/im SET(PKG_LIST dali-core dali-adaptor - dali-toolkit) + dali-toolkit ) INCLUDE(FindPkgConfig) pkg_check_modules(REQUIRED_PKGS REQUIRED ${PKG_LIST}) diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec index 296c5b1..06d9813 100755 --- a/packaging/com.samsung.dali-demo.spec +++ b/packaging/com.samsung.dali-demo.spec @@ -19,7 +19,6 @@ BuildRequires: pkgconfig(capi-media-player) BuildRequires: pkgconfig(dlog) BuildRequires: gettext-tools BuildRequires: pkgconfig(dali-core) -BuildRequires: pkgconfig(dali-adaptor) BuildRequires: pkgconfig(dali-toolkit) #need libtzplatform-config for directory if tizen version is 3.x @@ -27,6 +26,9 @@ BuildRequires: pkgconfig(dali-toolkit) BuildRequires: pkgconfig(libtzplatform-config) %endif +# DALi C++ applications always run on dali-adaptor. +BuildRequires: pkgconfig(dali-adaptor) + %description The OpenGLES Canvas Core Demo is a collection of examples and demonstrations of the capability of the toolkit. -- 2.7.4