diff options
| author | seunggi.hong <seunggi.hong@samsung.com> | 2015-04-07 09:51:13 +0900 |
|---|---|---|
| committer | seunggi.hong <seunggi.hong@samsung.com> | 2015-04-07 10:06:08 +0900 |
| commit | fa3b87960f067ff4e92591feca759001beb73ad7 (patch) | |
| tree | 9441f44ff1e31a6ba5ffdda8e60d1b83c17e7b20 | |
| parent | cba29738bb6131fd42b22affb9d7e8cd41e3a914 (diff) | |
| download | messages-fa3b87960f067ff4e92591feca759001beb73ad7.tar.gz messages-fa3b87960f067ff4e92591feca759001beb73ad7.tar.bz2 messages-fa3b87960f067ff4e92591feca759001beb73ad7.zip | |
Modify for 64bit buildsubmit/tizen_wearable/20150407.033739submit/tizen_tv/20150407.033757submit/tizen_mobile/20150407.012208submit/tizen_common/20150408.044436submit/tizen_common/20150407.131750submit/tizen_common/20150407.033714accepted/tizen/wearable/20150407.050112accepted/tizen/tv/20150407.050032accepted/tizen/mobile/20150407.051918accepted/tizen/common/20150408.103113tizen_3.0.2015.q2_common
Change-Id: I6b7008c1c128484361b9b24690cf7c369fb5c1cd
Signed-off-by: seunggi.hong <seunggi.hong@samsung.com>
| -rw-r--r-- | CMakeLists.txt | 8 | ||||
| -rw-r--r-- | packaging/capi-messaging-messages.spec | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index efe3332..bb1380f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ - +SET(LIBDIR ${LIB_INSTALL_DIR}) CMAKE_MINIMUM_REQUIRED(VERSION 2.6) SET(fw_name "capi-messaging-messages") @@ -28,7 +28,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}) @@ -42,7 +42,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/messaging FILES_MATCHING @@ -60,7 +60,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) ADD_SUBDIRECTORY(test) diff --git a/packaging/capi-messaging-messages.spec b/packaging/capi-messaging-messages.spec index 210e4cf..05611fe 100644 --- a/packaging/capi-messaging-messages.spec +++ b/packaging/capi-messaging-messages.spec @@ -41,7 +41,7 @@ Requires: pkgconfig(capi-base-common) MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` rm -fr cmake_build_tmp; mkdir cmake_build_tmp cd cmake_build_tmp -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} |