From 1e06d1096db1605c653ee1e3f955efa80d2264d8 Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Thu, 11 Jun 2015 20:23:14 +0900 Subject: [PATCH] Support 64bit architecture Change-Id: If7b8e9ec9b58454be7e885fdd3764af7b627a48b --- CMakeLists.txt | 5 +++-- packaging/capi-ui-inputmethod.spec | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c5efaaa..c37ccc5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ SET(description "Input Method APIs") SET(service "ui") SET(submodule "inputmethod") SET(dependents "capi-base-common dlog elementary ecore-imf libscl-core isf") +SET(LIBDIR ${LIB_INSTALL_DIR}) SET(Services "application" @@ -84,7 +85,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 FILES_MATCHING @@ -101,7 +102,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-ui-inputmethod) IF(UNIX) diff --git a/packaging/capi-ui-inputmethod.spec b/packaging/capi-ui-inputmethod.spec index 2cb463a..0347b4c 100644 --- a/packaging/capi-ui-inputmethod.spec +++ b/packaging/capi-ui-inputmethod.spec @@ -39,7 +39,7 @@ export FFLAGS+=" -DTIZEN_DEBUG_ENABLE -fPIC -fvisibility=hidden" rm -rf CMakeFiles rm -rf CMakeCache.txt MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} +cmake . -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DLIB_INSTALL_DIR:PATH=%{_libdir} make %{?jobs:-j%jobs} -- 2.7.4