diff options
author | Minkyu Kang <mk7.kang@samsung.com> | 2015-07-30 21:02:32 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2015-07-30 21:02:32 -0700 |
commit | d1a3c030c3fd146835dc2acc345ed095b5ed0e63 (patch) | |
tree | e1abadd6e1094c8374e593ab53a0ca986fec1c50 | |
parent | cd1777c52609d2c2fcea665470feff296814bd74 (diff) | |
parent | ec41ebc96ba44cb35d1ba6ebc3b4111b07bd0c42 (diff) | |
download | air_favorite-d1a3c030c3fd146835dc2acc345ed095b5ed0e63.tar.gz air_favorite-d1a3c030c3fd146835dc2acc345ed095b5ed0e63.tar.bz2 air_favorite-d1a3c030c3fd146835dc2acc345ed095b5ed0e63.zip |
Merge "add application icon" into tizen
-rw-r--r-- | CMakeLists.txt | 7 | ||||
-rw-r--r-- | org.tizen.favorite.png | bin | 0 -> 4144 bytes | |||
-rw-r--r-- | packaging/org.tizen.favorite.spec | 4 |
3 files changed, 11 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fa84ed3..3bce42a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,12 @@ ENDIF(NOT DEFINED IMGDIR) IF(NOT DEFINED PACKAGEDIR) SET(PACKAGEDIR "/usr/share/packages") ENDIF(NOT DEFINED PACKAGEDIR) +IF(NOT DEFINED DESKTOP_ICONDIR) + SET(DESKTOP_ICONDIR "/usr/share/icons") +ENDIF(NOT DEFINED DESKTOP_ICONDIR) +IF(NOT DEFINED DESKTOP_ICON) + SET(DESKTOP_ICON ${PACKAGE_NAME}.png) +ENDIF(NOT DEFINED DESKTOP_ICON) SET(SRCS src/main.c @@ -95,5 +101,6 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${BINDIR}) INSTALL(FILES ${PACKAGE_NAME}.xml DESTINATION ${PACKAGEDIR}) INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/res/images/ DESTINATION ${IMGDIR}) +INSTALL(FILES ${CMAKE_SOURCE_DIR}/${DESKTOP_ICON} DESTINATION ${DESKTOP_ICONDIR}) ADD_SUBDIRECTORY(res) diff --git a/org.tizen.favorite.png b/org.tizen.favorite.png Binary files differnew file mode 100644 index 0000000..2939298 --- /dev/null +++ b/org.tizen.favorite.png diff --git a/packaging/org.tizen.favorite.spec b/packaging/org.tizen.favorite.spec index a7b8908..9ce947c 100644 --- a/packaging/org.tizen.favorite.spec +++ b/packaging/org.tizen.favorite.spec @@ -24,6 +24,7 @@ BuildRequires: pkgconfig(tv-service) %define _edjedir %{_resdir}/edje %define _imgdir %{_resdir}/images %define _pkgdir %{_datadir}/packages +%define _desktop_icondir /usr/share/icons %description Favorite application shows the contents which were registered as favorite. @@ -40,6 +41,8 @@ cmake \ -DRESDIR=%{_resdir} \ -DEDJEDIR=%{_edjedir} \ -DIMGDIR=%{_imgdir} \ + -DDESKTOP_ICONDIR=%{_desktop_icondir} \ + -DDESKTOP_ICON=%{name}.png \ -DPACKAGEDIR=%{_pkgdir} make %{?jobs:-j%jobs} @@ -56,3 +59,4 @@ rm -rf %{buildroot} %{_bindir}/* %{_resdir}/* %{_pkgdir}/%{name}.xml +%{_desktop_icondir}/%{name}.png |