diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-10-06 21:17:52 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-10-08 12:17:31 +0900 |
commit | ffb159ab752733a9f4689db05d0d0bf5966e7b23 (patch) | |
tree | f41779bd2db434e75d7012324c07a0fb80a9adf2 | |
parent | 309b9fee596451a2c850efed975a24260d6bfecc (diff) | |
download | mmsvc-recorder-ffb159ab752733a9f4689db05d0d0bf5966e7b23.tar.gz mmsvc-recorder-ffb159ab752733a9f4689db05d0d0bf5966e7b23.tar.bz2 mmsvc-recorder-ffb159ab752733a9f4689db05d0d0bf5966e7b23.zip |
Update CMakeLists.txt and spec filessubmit/tizen/20151008.052904accepted/tizen/wearable/20151008.132941accepted/tizen/tv/20151008.132926accepted/tizen/mobile/20151008.132907
Change-Id: I4695da31c4234811f4554371a07b635d61cdd29c
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | CMakeLists.txt | 19 | ||||
-rw-r--r-- | legacy/CMakeLists.txt | 12 | ||||
-rw-r--r-- | muse/CMakeLists.txt | 9 | ||||
-rw-r--r-- | packaging/mmsvc-recorder.spec | 18 |
4 files changed, 17 insertions, 41 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f008cd0..0b5327c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,28 +1,19 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) # project -SET(prefix "/usr") SET(maintainer "Jeongmo Yang<jm80.yang>, Hyuntae Kim<ht1211.kim@samsung.com>, Seokhoon Lee<andy.shlee@samsung.com>, Taeyoung Chung <ty83.chung@samsung.com>, Sejong Park<sejong123.park@samsung.com>") -SET(description "A Camera library in Tizen Native API") +SET(description "A Recorder module for muse-server") SET(service "mmsvc") SET(submodule "recorder") SET(fw_name "${service}-${submodule}") PROJECT(${fw_name}) -SET(CMAKE_INSTALL_PREFIX ${prefix}) -SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +SET(pc_dependents "dlog capi-media-audio-io") -SET(INC_DIR legacy/include) -INCLUDE_DIRECTORIES(${INC_DIR}) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") -SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") - -IF("${ARCH}" STREQUAL "arm") - ADD_DEFINITIONS("-DTARGET") -ENDIF("${ARCH}" STREQUAL "arm") - -ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") +SET(PC_NAME ${fw_name}) +SET(PC_REQUIRED ${pc_dependents}) +SET(PC_LDFLAGS -lmuse-recorder) CONFIGURE_FILE( ${fw_name}.pc.in diff --git a/legacy/CMakeLists.txt b/legacy/CMakeLists.txt index 39b8ea5..0d4f7a1 100644 --- a/legacy/CMakeLists.txt +++ b/legacy/CMakeLists.txt @@ -5,7 +5,6 @@ SET(submodule "recorder") # for package file SET(dependents "dlog mm-camcorder capi-media-audio-io audio-session-mgr") -SET(pc_dependents "capi-base-common capi-media-audio-io") SET(fw_name "${service}-${submodule}") @@ -48,13 +47,4 @@ SET_TARGET_PROPERTIES(${fw_name} ) INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) -INSTALL( - DIRECTORY ${INC_DIR}/ DESTINATION include/media - FILES_MATCHING - PATTERN "*_private.h" EXCLUDE - PATTERN "${INC_DIR}/*.h" - ) - -SET(PC_NAME ${fw_name}) -SET(PC_REQUIRED ${pc_dependents}) -SET(PC_LDFLAGS -l${fw_name}) + diff --git a/muse/CMakeLists.txt b/muse/CMakeLists.txt index f138452..79a15b5 100644 --- a/muse/CMakeLists.txt +++ b/muse/CMakeLists.txt @@ -3,8 +3,8 @@ SET(service "muse") SET(submodule "recorder") SET(dependents "dlog mused mm-common glib-2.0 capi-media-audio-io audio-session-mgr") -SET(pc_dependents "dlog capi-media-audio-io") SET(fw_name "${service}-${submodule}") + PROJECT(${fw_name}) SET(CMAKE_INSTALL_PREFIX /usr) @@ -19,7 +19,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "-I./include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") +SET(CMAKE_C_FLAGS "-I./include -I../legacy/include ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Wextra -Wno-array-bounds -Wno-empty-body -Wno-ignored-qualifiers -Wno-unused-parameter -Wshadow -Wwrite-strings -Wswitch-default -Wno-unused-but-set-parameter -Wno-unused-but-set-variable") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") @@ -34,7 +34,6 @@ SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") aux_source_directory(src MUSED_SOURCES) ADD_LIBRARY(${fw_name} SHARED ${MUSED_SOURCES}) - TARGET_LINK_LIBRARIES(${fw_name} legacy-recorder ${${fw_name}_LDFLAGS}) SET_TARGET_PROPERTIES(${fw_name} @@ -52,7 +51,3 @@ INSTALL( PATTERN "${INC_DIR}/*.h" ) -SET(PC_NAME ${fw_name}) -SET(PC_REQUIRED ${pc_dependents}) -SET(PC_LDFLAGS -l${fw_name}) -SET(PC_CFLAGS -I\${includedir}/media) diff --git a/packaging/mmsvc-recorder.spec b/packaging/mmsvc-recorder.spec index c990731..8473b65 100644 --- a/packaging/mmsvc-recorder.spec +++ b/packaging/mmsvc-recorder.spec @@ -1,8 +1,8 @@ Name: mmsvc-recorder -Summary: A Recorder library in Tizen Native API +Summary: A Recorder module for muse server Version: 0.2.2 -Release: 0 -Group: Multimedia/API +Release: 1 +Group: Multimedia/Libraries License: Apache-2.0 Source0: %{name}-%{version}.tar.gz BuildRequires: cmake @@ -20,16 +20,16 @@ BuildRequires: pkgconfig(capi-media-audio-io) %description -A Recorder library in Tizen Native API +A Recorder module for muse servier and native recorder API. %package devel -Summary: A Recorder library in Tizen C API (Development) +Summary: A Recorder module for muse server (Development) Requires: %{name} = %{version}-%{release} %description devel -A Recorder library in Tizen Native API Development Package. +Development related files of a recorder module for muse server. %prep @@ -62,9 +62,9 @@ cp LICENSE.APLv2 %{buildroot}/usr/share/license/%{name} %{_libdir}/liblegacy-recorder.so* %{_libdir}/libmuse-recorder.so* %{_datadir}/license/%{name} -%{_includedir}/media/legacy_recorder.h %files devel -%{_includedir}/media/muse_recorder.h -%{_includedir}/media/muse_recorder_msg.h +%{_includedir}/media/*.h %{_libdir}/pkgconfig/*.pc +%{_libdir}/liblegacy-recorder.so +%{_libdir}/libmuse-recorder.so |