From: Ji-hoon Lee Date: Tue, 7 Jan 2020 04:30:40 +0000 (+0900) Subject: Remove unnecessary profile checks X-Git-Tag: submit/tizen/20200113.120709^2~9 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a566cbd1fa68fa274d6e00e6c74d402c89c56442;p=platform%2Fcore%2Fuifw%2Fmulti-assistant.git Remove unnecessary profile checks Change-Id: I50eb6b7e0d9e61c97185232ca41e52575cfd066b --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a442b9..7e2856d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,15 +42,9 @@ INCLUDE_DIRECTORIES("${CMAKE_SOURCE_DIR}/include") ## Dependent packages ## INCLUDE(FindPkgConfig) -IF("${_TV_PRODUCT}" STREQUAL "TRUE") -pkg_check_modules(pkgs REQUIRED - capi-base-common ecore-wayland capi-network-bluetooth capi-network-bluetooth-tv capi-system-info cynara-client cynara-session dbus-1 dlog ecore capi-message-port glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 vconf -) -ELSE() pkg_check_modules(pkgs REQUIRED capi-base-common ecore-wayland capi-system-info cynara-client cynara-session dbus-1 dlog ecore capi-message-port glib-2.0 json-glib-1.0 libgum libtzplatform-config libxml-2.0 vconf ) -ENDIF() ## API ## diff --git a/packaging/multi-assistant.spec b/packaging/multi-assistant.spec index 989df27..7b66a86 100644 --- a/packaging/multi-assistant.spec +++ b/packaging/multi-assistant.spec @@ -25,11 +25,6 @@ BuildRequires: pkgconfig(libtzplatform-config) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(pkgmgr-info) BuildRequires: pkgconfig(pkgmgr-installer) -%if "%{tizen_profile_name}" == "tv" -BuildRequires: pkgconfig(capi-network-bluetooth) -BuildRequires: pkgconfig(capi-network-bluetooth-tv) -BuildRequires: pkgconfig(msfapi) -%endif BuildRequires: pkgconfig(vconf) BuildRequires: cmake @@ -76,14 +71,8 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage" export LDFLAGS+=" -lgcov" %endif -%if "%{tizen_profile_name}" == "tv" -export CFLAGS="$CFLAGS -DTV_PRODUCT" -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \ - -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -D_TV_PRODUCT=TRUE -DTZ_SYS_BIN=%TZ_SYS_BIN -%else cmake . -DCMAKE_INSTALL_PREFIX=/usr -DLIBDIR=%{_libdir} -DBINDIR=%{_bindir} -DINCLUDEDIR=%{_includedir} \ -DTZ_SYS_RO_SHARE=%TZ_SYS_RO_SHARE -DTZ_SYS_BIN=%TZ_SYS_BIN -%endif make %{?jobs:-j%jobs} %if 0%{?gcov:1}