diff options
| author | Jiwoong Im <jiwoong.im@samsung.com> | 2016-11-18 09:55:29 +0900 |
|---|---|---|
| committer | Jiwoong Im <jiwoong.im@samsung.com> | 2016-11-18 13:12:47 +0900 |
| commit | 2240e3859435c519298bb9e8ee2d821cbb1fea17 (patch) | |
| tree | 8078bd9e3b744b453b01dc2bab3b0827178df031 | |
| parent | dea7a9bda379c5f5ec9ee14ca84074727d611985 (diff) | |
| download | app-svc-accepted/tizen_3.0.m2_wearable.tar.gz app-svc-accepted/tizen_3.0.m2_wearable.tar.bz2 app-svc-accepted/tizen_3.0.m2_wearable.zip | |
Fix CMakeLists.txtsubmit/tizen_3.0/20161122.021326submit/tizen_3.0.m2/20170104.093749accepted/tizen/3.0/wearable/20161123.083201accepted/tizen/3.0/tv/20161123.083144accepted/tizen/3.0/mobile/20161123.083116accepted/tizen/3.0/ivi/20161123.083217accepted/tizen/3.0/common/20161123.140603accepted/tizen/3.0.m2/wearable/20170104.122956accepted/tizen/3.0.m2/tv/20170104.122631accepted/tizen/3.0.m2/mobile/20170104.122007tizen_3.0_tvtizen_3.0.m2tizen_3.0accepted/tizen_3.0_wearableaccepted/tizen_3.0_tvaccepted/tizen_3.0_mobileaccepted/tizen_3.0_iviaccepted/tizen_3.0_commonaccepted/tizen_3.0.m2_wearableaccepted/tizen_3.0.m2_tvaccepted/tizen_3.0.m2_mobile
To make extendible for adding source & header files.
Change-Id: I646f0b36af92a4b7e3b9151a3937c32b70990fcd
Signed-off-by: Jiwoong Im <jiwoong.im@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | packaging/app-svc.spec | 2 |
2 files changed, 8 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.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 |