Support 64bit architecture 32/41132/1 accepted/tizen_3.0.2015.q2_common tizen_3.0.2015.q2_common tizen_3.0.m1_mobile tizen_3.0.m1_tv accepted/tizen/3.0.2015.q2/common/20150615.091831 accepted/tizen/common/20150611.145240 accepted/tizen/mobile/20150612.003714 accepted/tizen/tv/20150612.003731 accepted/tizen/wearable/20150612.003806 submit/tizen/20150611.103957 submit/tizen/20150611.123253 submit/tizen_3.0.2015.q2_common/20150615.075539 tizen_3.0.m1_mobile_release tizen_3.0.m1_tv_release tizen_3.0.m2.a1_mobile_release tizen_3.0.m2.a1_tv_release
authorJihoon Kim <jihoon48.kim@samsung.com>
Thu, 11 Jun 2015 08:33:22 +0000 (17:33 +0900)
committerJihoon Kim <jihoon48.kim@samsung.com>
Thu, 11 Jun 2015 08:33:22 +0000 (17:33 +0900)
Change-Id: Ia34c9f7b984697732d9221b4bfae28fda52789e4

CMakeLists.txt
packaging/libscl-common.spec

index 39740e7..f470389 100644 (file)
@@ -8,7 +8,7 @@ SET(SRCS
 SET(PACKAGE ${PROJECT_NAME})
 SET(PKGNAME ${PACKAGE})
 SET(PREFIX ${CMAKE_INSTALL_PREFIX})
-SET(LIBDIR "${PREFIX}/lib")
+SET(LIBDIR ${LIB_INSTALL_DIR})
 
 IF("${CMAKE_BUILD_TYPE}" STREQUAL "")
     SET(CMAKE_BUILD_TYPE "Release")
@@ -50,4 +50,4 @@ INSTALL(FILES "${CMAKE_SOURCE_DIR}/src/sclcast.h" DESTINATION include/libscl-com
 INSTALL(FILES "${CMAKE_SOURCE_DIR}/src/sclcast-efl.h" DESTINATION include/libscl-common)
 
 CONFIGURE_FILE(${PROJECT_NAME}.pc.in ${PROJECT_NAME}.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIBDIR}/pkgconfig)
index 3c40354..4275e5c 100644 (file)
@@ -29,7 +29,7 @@ A devel package of libscl-common library that helps developing S/W Keyboard
 
 
 %build
-cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix}
+cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DLIB_INSTALL_DIR:PATH=%{_libdir}
 make %{?jobs:-j%jobs}
 
 %install