From 2240e3859435c519298bb9e8ee2d821cbb1fea17 Mon Sep 17 00:00:00 2001 From: Jiwoong Im Date: Fri, 18 Nov 2016 09:55:29 +0900 Subject: [PATCH] Fix CMakeLists.txt To make extendible for adding source & header files. Change-Id: I646f0b36af92a4b7e3b9151a3937c32b70990fcd Signed-off-by: Jiwoong Im --- CMakeLists.txt | 11 +++++++---- 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 -- 2.7.4