From 40697b3e1dc1b44a306a5e162f62f14e33f9536c Mon Sep 17 00:00:00 2001 From: Jiwan Kim Date: Fri, 27 Mar 2015 10:32:19 +0900 Subject: [PATCH] Fix for 64-bit build compatibility Change-Id: Ie8dc617a0d9e5e9e1780f5eea6f000081aa4cb55 Signed-off-by: Jiwan Kim --- CMakeLists.txt | 7 ++++--- packaging/capi-telephony.spec | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5f6ac13..3f34dc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,6 +48,7 @@ PROJECT(${fw_name}) SET(CMAKE_INSTALL_PREFIX ${prefix}) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(VERSION ${version}) SET(INC_DIR include) @@ -71,7 +72,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=${LIBDIR}") aux_source_directory(src SOURCES) ADD_LIBRARY(${fw_name} SHARED ${SOURCES}) @@ -85,7 +86,7 @@ SET_TARGET_PROPERTIES(${fw_name} CLEAN_DIRECT_OUTPUT 1 ) -INSTALL(TARGETS ${fw_name} DESTINATION lib) +INSTALL(TARGETS ${fw_name} DESTINATION ${LIBDIR}) INSTALL( DIRECTORY ${INC_DIR}/ DESTINATION include/${service} FILES_MATCHING @@ -102,7 +103,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 ${LIBDIR}/pkgconfig) INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE DESTINATION /usr/share/license RENAME capi-telephony) ADD_SUBDIRECTORY(test) diff --git a/packaging/capi-telephony.spec b/packaging/capi-telephony.spec index b2ff33b..26c55e6 100644 --- a/packaging/capi-telephony.spec +++ b/packaging/capi-telephony.spec @@ -29,7 +29,10 @@ Requires: %{name} = %{version}-%{release} %build MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR=%{_libdir} \ + -DFULLVER=%{version} \ + -DMAJORVER=${MAJORVER} make %{?jobs:-j%jobs} -- 2.34.1