diff options
| author | Hwankyu Jhun <h.jhun@samsung.com> | 2016-11-24 09:24:15 +0900 |
|---|---|---|
| committer | Hwankyu Jhun <h.jhun@samsung.com> | 2016-11-24 09:24:15 +0900 |
| commit | f243b626f41667056f07aba7889556be69439ef6 (patch) | |
| tree | e69d37c364514942cd6ad6cbc6b49037d6b20fa4 | |
| parent | 45c584e4cf1b5289f7bc3306f791cec7225dd91a (diff) | |
| parent | 2240e3859435c519298bb9e8ee2d821cbb1fea17 (diff) | |
| download | app-svc-accepted/tizen/4.0/unified/20170816.012027.tar.gz app-svc-accepted/tizen/4.0/unified/20170816.012027.tar.bz2 app-svc-accepted/tizen/4.0/unified/20170816.012027.zip | |
Merge branch 'tizen_3.0' into tizentizen_4.0.m1_releasesubmit/tizen_unified/20170308.100405submit/tizen_4.0_unified/20170814.115522submit/tizen_4.0/20170814.115522submit/tizen_4.0/20170811.094300submit/tizen/20161124.000829accepted/tizen/wearable/20161125.004053accepted/tizen/unified/20170309.032156accepted/tizen/tv/20161125.003930accepted/tizen/mobile/20161125.003708accepted/tizen/ivi/20161125.004213accepted/tizen/common/20161125.095325accepted/tizen/4.0/unified/20170816.015044accepted/tizen/4.0/unified/20170816.012027accepted/tizen_wearableaccepted/tizen_tvaccepted/tizen_mobileaccepted/tizen_iviaccepted/tizen_common
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | packaging/app-svc.manifest | 3 | ||||
| -rw-r--r-- | packaging/app-svc.spec | 2 |
3 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ef06907..4fb780e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ SET(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) PROJECT(appsvc C) SET(VERSION_MAJOR 0) SET(VERSION "${VERSION_MAJOR}.1.0") +AUX_SOURCE_DIRECTORY(src SOURCES) ### Global setting ### @@ -62,9 +63,8 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed") ### Build ### # aul -add_library(appsvc SHARED - src/appsvc.c - ) +ADD_LIBRARY(appsvc SHARED ${SOURCES}) + TARGET_LINK_LIBRARIES(appsvc ${libpkgs_LDFLAGS}) SET_TARGET_PROPERTIES(appsvc PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(appsvc PROPERTIES VERSION ${VERSION}) @@ -77,7 +77,10 @@ CONFIGURE_FILE(appsvc.pc.in appsvc.pc @ONLY) INSTALL(TARGETS appsvc DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) INSTALL(TARGETS ${AVATAR_NAME} DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/appsvc.h DESTINATION include/appsvc) +INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/include/ DESTINATION include/appsvc/ + FILES_MATCHING + PATTERN "*.h" + ) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/appsvc.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) # test diff --git a/packaging/app-svc.manifest b/packaging/app-svc.manifest index 017d22d..718e49c 100644 --- a/packaging/app-svc.manifest +++ b/packaging/app-svc.manifest @@ -2,4 +2,7 @@ <request> <domain name="_"/> </request> + <assign> + <filesystem path="/usr/bin/appsvc_test" exec_label="User" /> + </assign> </manifest> diff --git a/packaging/app-svc.spec b/packaging/app-svc.spec index 3724c0d..5611618 100644 --- a/packaging/app-svc.spec +++ b/packaging/app-svc.spec @@ -67,4 +67,4 @@ cp %{SOURCE1001} . %manifest %{name}.manifest %{_libdir}/pkgconfig/appsvc.pc %{_libdir}/libappsvc.so -%{_includedir}/appsvc/appsvc.h +%{_includedir}/appsvc/*.h |