From: joon.c.baek Date: Tue, 26 May 2015 05:02:30 +0000 (+0900) Subject: ttrace: Support AARCH64 X-Git-Tag: submit/tizen/20150602.035833^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9ef1b34b62170d88ab525f706af826fc16abe80b;p=tools%2Fttrace.git ttrace: Support AARCH64 Support AARCH64 Change-Id: I1c1b13289067d77cd4f36ceee249143c4ad54bcf Signed-off-by: joon.c.baek --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 0155673..195375f 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,8 +3,6 @@ PROJECT(ttrace C CXX) SET(PREFIX ${CMAKE_INSTALL_PREFIX}) SET(EXEC_PREFIX "\${prefix}") -SET(LIBDIR "\${prefix}/lib") -SET(INCLUDEDIR "\${prefix}/include") SET(VERSION_MAJOR 1) SET(VERSION "${VERSION_MAJOR}.1") @@ -43,10 +41,10 @@ TARGET_LINK_LIBRARIES(${TTRACE} ${pkg_ttrace_LDFLAGS} "-ldl") CONFIGURE_FILE(${TTRACE}.pc.in ${TTRACE}.pc @ONLY) -INSTALL(TARGETS ${TTRACE} DESTINATION lib COMPONENT RuntimeLibraries) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TTRACE}.pc DESTINATION lib/pkgconfig) +INSTALL(TARGETS ${TTRACE} DESTINATION ${LIBDIR} COMPONENT RuntimeLibraries) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TTRACE}.pc DESTINATION ${LIBDIR}/pkgconfig) FOREACH(hfile ${HEADERS_ttrace}) - INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${hfile} DESTINATION include) + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/${hfile} DESTINATION ${INCLUDEDIR}) ENDFOREACH(hfile) ################################################################# @@ -73,4 +71,4 @@ TARGET_LINK_LIBRARIES(${ATRACE} ${pkg_atrace_LDFLAGS} "-ldl") CONFIGURE_FILE(${ATRACE}.pc.in ${ATRACE}.pc @ONLY) INSTALL(TARGETS ${ATRACE} DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ATRACE}.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${ATRACE}.pc DESTINATION ${LIBDIR}/pkgconfig) diff --git a/atrace.pc.in b/atrace.pc.in index 4edb568..422aeba 100644 --- a/atrace.pc.in +++ b/atrace.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: atrace diff --git a/packaging/ttrace.spec b/packaging/ttrace.spec index ecd30ff..ea77215 100755 --- a/packaging/ttrace.spec +++ b/packaging/ttrace.spec @@ -28,7 +28,7 @@ T-trace library devel %build export CFLAGS="$CFLAGS -g -Wall -std=gnu99" export CXXFLAGS="$CXXFLAGS -std=c++0x -fPIE -pie" -cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} . +cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} -DBUILD_PKGTYPE=rpm -DLIBDIR=%{_libdir} -DINCLUDEDIR=%{_includedir} make %{?jobs:-j%jobs} %install diff --git a/ttrace.pc.in b/ttrace.pc.in index 11ae6a9..709639e 100644 --- a/ttrace.pc.in +++ b/ttrace.pc.in @@ -2,7 +2,7 @@ prefix=@PREFIX@ exec_prefix=@EXEC_PREFIX@ -libdir=@LIBDIR@ +libdir=@LIB_INSTALL_DIR@ includedir=@INCLUDEDIR@ Name: ttrace