diff options
| author | Anas Nashif <anas.nashif@intel.com> | 2013-02-05 05:49:38 -0800 |
|---|---|---|
| committer | Junfeng Dong <junfeng.dong@intel.com> | 2013-04-07 19:15:01 +0800 |
| commit | a3ed7ae9c8906a86797ad9da57db32bced654452 (patch) | |
| tree | 76618567b53f25b71e397df2f98c059a0a9584ad | |
| parent | 7f505dfbea845508c9fe95feadf61bf33b1c5c6c (diff) | |
| download | camera-tizen_ivi_genivi.tar.gz camera-tizen_ivi_genivi.tar.bz2 camera-tizen_ivi_genivi.zip | |
Fixed build on x86_64submit/tizen_ivi_genivi/20140131.060659submit/tizen_2.1/20130424.230256submit/tizen/20130912.090046submit/tizen/20130912.075623submit/tizen/20130517.044623ivi_oct_m2accepted/tizen_2.1/20130425.040704accepted/tizen/ivi/genivi/20140131.061812accepted/tizen/20130912.200339accepted/tizen/20130912.192239accepted/tizen/20130912.141801accepted/tizen/20130912.093540accepted/tizen/20130912.085127accepted/tizen/20130912.081719accepted/tizen/20130520.1006432.1b_releasetizen_ivi_genivitizen_2.1accepted/tizen/ivi/genivi
Change-Id: Iffdce02a90e0a1b67813103a64af384463ba3f7c
| -rwxr-xr-x | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | capi-media-camera.pc.in | 2 | ||||
| -rwxr-xr-x | packaging/capi-media-camera.spec | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0a35b5a..673daab 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ FOREACH(flag ${${fw_name}_CFLAGS}) SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}") ENDFOREACH(flag) -SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall -Werror") +SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -fPIC -Wall") SET(CMAKE_C_FLAGS_DEBUG "-O0 -g") IF("${ARCH}" STREQUAL "arm") @@ -53,7 +53,7 @@ ENDIF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"") ADD_DEFINITIONS("-DTIZEN_DEBUG") -SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=/usr/lib") +SET(CMAKE_EXE_LINKER_FLAGS "-Wl,--as-needed -Wl,--rpath=${LIB_INSTALL_DIR}") aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) @@ -68,7 +68,7 @@ SET_TARGET_PROPERTIES(${fw_name} TARGET_LINK_LIBRARIES(${fw_name} ${${fw_name}_LDFLAGS}) -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIB_INSTALL_DIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/${service} FILES_MATCHING @@ -85,7 +85,7 @@ CONFIGURE_FILE( ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc @ONLY ) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) #ADD_SUBDIRECTORY(test) diff --git a/capi-media-camera.pc.in b/capi-media-camera.pc.in index 5d02f8d..1997d91 100644 --- a/capi-media-camera.pc.in +++ b/capi-media-camera.pc.in @@ -3,7 +3,7 @@ prefix=@PREFIX@ exec_prefix=/usr -libdir=/usr/lib +libdir=@LIB_INSTALL_DIR@ includedir=/usr/include/media Name: @PC_NAME@ diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 607cb54..23b1380 100755 --- a/packaging/capi-media-camera.spec +++ b/packaging/capi-media-camera.spec @@ -9,8 +9,6 @@ BuildRequires: cmake BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(mm-camcorder) BuildRequires: pkgconfig(capi-base-common) -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %description @@ -30,7 +28,7 @@ Requires: %{name} = %{version}-%{release} %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} |