From: Jihoon Kim Date: Thu, 11 Jun 2015 11:27:40 +0000 (+0900) Subject: Support 64bit architecture X-Git-Tag: submit/tizen/20150612.011258~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6bdd18f504207846cab612b255370fe5566b830a;p=platform%2Fcore%2Fapi%2Finputmethod-manager.git Support 64bit architecture Change-Id: I75bd0d4758f66f15f5b17a87736da8964ebc687a --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 2067099..ffd2ab7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,6 +8,7 @@ SET(description "Input Method Manager APIs") SET(service "ui") SET(submodule "inputmethod-manager") SET(dependents "capi-base-common dlog 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-manager) IF(UNIX) diff --git a/packaging/capi-ui-inputmethod-manager.spec b/packaging/capi-ui-inputmethod-manager.spec index 640e8f6..433354d 100644 --- a/packaging/capi-ui-inputmethod-manager.spec +++ b/packaging/capi-ui-inputmethod-manager.spec @@ -36,7 +36,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}