diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2015-10-06 21:15:49 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2015-10-08 12:15:58 +0900 |
| commit | dea991d0f5b4f5d6fef445b85d083d4e68d95f85 (patch) | |
| tree | ce92b0bdaf2213b4b7cd535f147053344d3d00fd | |
| parent | e6cc049a9a0a1022d1beb22ab76a663b9d0b545b (diff) | |
| download | camera-dea991d0f5b4f5d6fef445b85d083d4e68d95f85.tar.gz camera-dea991d0f5b4f5d6fef445b85d083d4e68d95f85.tar.bz2 camera-dea991d0f5b4f5d6fef445b85d083d4e68d95f85.zip | |
Update CMakeLists.txtsubmit/tizen/20151008.052904accepted/tizen/wearable/20151008.132943accepted/tizen/tv/20151008.132927accepted/tizen/mobile/20151008.132909
Change-Id: Id835b3b0e83cbfc6f260f5660f1e509cb7fb0fa9
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 26 | ||||
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 |
2 files changed, 6 insertions, 22 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c93862a..ec96a58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,37 +1,22 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) -SET(Services - "application" - "base" - "content" - "location" - "media" - "messaging" - "network" - "social" - "telephony" - "system" - ) - # project SET(project_prefix "capi") SET(prefix "/usr") -SET(version "0.0.1") 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(service "media") SET(submodule "camera") # for package file -SET(dependents "libtbm dlog mm-common capi-base-common capi-media-tool mm-camcorder ecore elementary mused") -SET(pc_dependents "mm-camcorder capi-base-common capi-media-tool gstreamer-1.0 libtbm evas ecore elementary") +SET(dependents "libtbm dlog mm-common capi-base-common capi-media-tool mm-camcorder ecore elementary mmsvc-camera") +SET(pc_dependents "capi-base-common capi-media-tool libtbm evas ecore elementary") SET(fw_name "${project_prefix}-${service}-${submodule}") PROJECT(${fw_name}) SET(CMAKE_INSTALL_PREFIX ${prefix}) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) -SET(VERSION ${version}) SET(INC_DIR include) INCLUDE_DIRECTORIES(${INC_DIR}) @@ -71,8 +56,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) - -TARGET_LINK_LIBRARIES(${fw_name} muse-camera ${${fw_name}_LDFLAGS}) +TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS}) INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( @@ -99,10 +83,10 @@ IF(UNIX) ADD_CUSTOM_TARGET (distclean @echo cleaning for source distribution) ADD_CUSTOM_COMMAND( - DEPENDS clean + DEPENDS clean COMMENT "distribution clean" COMMAND find - ARGS . + ARGS . -not -name config.cmake -and \( -name tester.c -or -name Testing -or diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index dec0196..cf7486d 100644 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -4,7 +4,7 @@ Name: capi-media-camera Summary: A Camera library in Tizen Native API. Version: 0.2.9 -Release: 0 +Release: 1 Group: Multimedia/API License: Apache-2.0 Source0: %{name}-%{version}.tar.gz |