From eec073884a762bc5eb2dca8b71c7275e4709b5e5 Mon Sep 17 00:00:00 2001 From: Seonah Moon Date: Tue, 14 Jun 2016 15:43:35 +0900 Subject: [PATCH] Fix the build error(aarch64) Change-Id: I2b00a1c547098a32a362430add431ecf12fc2992 Signed-off-by: Seonah Moon --- CMakeLists.txt | 7 ++++++- packaging/mobileap-agent.spec | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cf5a865..06bd2f4 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,6 +42,7 @@ SET(CMAKE_C_FLAGS_RELEASE "-O2 -fPIE") FIND_PROGRAM(UNAME NAMES uname) EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") + IF("${ARCH}" STREQUAL "arm") ADD_DEFINITIONS("-DTARGET") MESSAGE("add -DTARGET") @@ -75,7 +76,11 @@ ADD_EXECUTABLE(${PROJECT_NAME} ${SRCS} ${CMAKE_BINARY_DIR}/mobileap-agent-server TARGET_LINK_LIBRARIES(${PROJECT_NAME} ${pkgs_LDFLAGS}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin) -INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mobileap-agent.service DESTINATION lib/systemd/system) +IF("${ARCH}" MATCHES "^aarch64.*|.*86_64.*") + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mobileap-agent.service DESTINATION lib64/systemd/system) +ELSE() + INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/mobileap-agent.service DESTINATION lib/systemd/system) +ENDIF() INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/packaging/org.tizen.MobileapAgent.service DESTINATION share/dbus-1/system-services) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/tethering_dump.sh DESTINATION /opt/etc/dump.d/module.d/) diff --git a/packaging/mobileap-agent.spec b/packaging/mobileap-agent.spec index c32fc41..518dbd9 100644 --- a/packaging/mobileap-agent.spec +++ b/packaging/mobileap-agent.spec @@ -1,6 +1,6 @@ Name: mobileap-agent Summary: Mobile AP daemon for setting tethering environments -Version: 1.0.58 +Version: 1.0.59 Release: 1 Group: System/Network License: Apache-2.0 -- 2.7.4