Fix the build error(aarch64) 96/74396/1 accepted/tizen/common/20160614.144107 accepted/tizen/ivi/20160615.070049 accepted/tizen/mobile/20160615.070003 accepted/tizen/tv/20160615.070029 accepted/tizen/wearable/20160615.070018 submit/tizen/20160614.070528
authorSeonah Moon <seonah1.moon@samsung.com>
Tue, 14 Jun 2016 06:43:35 +0000 (15:43 +0900)
committerSeonah Moon <seonah1.moon@samsung.com>
Tue, 14 Jun 2016 06:43:49 +0000 (15:43 +0900)
Change-Id: I2b00a1c547098a32a362430add431ecf12fc2992
Signed-off-by: Seonah Moon <seonah1.moon@samsung.com>
CMakeLists.txt
packaging/mobileap-agent.spec

index cf5a865..06bd2f4 100755 (executable)
@@ -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/)
 
index c32fc41..518dbd9 100644 (file)
@@ -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