From d9c813d15e4d4450a6e70799d6bcac4681392e32 Mon Sep 17 00:00:00 2001 From: "sungwook79.park" Date: Thu, 8 Jun 2017 16:33:54 +0900 Subject: [PATCH] Fix the issue that is loading wrong library Change-Id: I3b1be1e55068cf9e670c809158bb7b424707de7c Signed-off-by: sungwook79.park --- CMakeLists.txt | 16 +++++++++++++--- packaging/smartreply-service.spec | 7 +------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 667be32..996c7e2 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,15 +35,25 @@ IF("${PROFILE}" STREQUAL "wearable") ENDIF("${PROFILE}" STREQUAL "wearable") # Target vs Emulator -IF("${ARCH}" STREQUAL "arm") +FIND_PROGRAM(UNAME NAMES uname) +EXEC_PROGRAM("${UNAME}" ARGS "-m" OUTPUT_VARIABLE "ARCH") +if(${ARCH} STREQUAL "armv7l") ADD_DEFINITIONS("-D_TARGET") INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/armv7l/libsmart-reply-engine-en_US.so DESTINATION ${LIBDIR}) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/armv7l/libsmart-reply-engine-ko_KR.so DESTINATION ${LIBDIR}) -ELSE("${ARCH}" STREQUAL "arm") +elseif(${ARCH} STREQUAL "i686") ADD_DEFINITIONS("-D_EMULATOR") INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/i586/libsmart-reply-engine-en_US.so DESTINATION ${LIBDIR}) INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/i586/libsmart-reply-engine-ko_KR.so DESTINATION ${LIBDIR}) -ENDIF("${ARCH}" STREQUAL "arm") +elseif(${ARCH} STREQUAL "aarch64") + ADD_DEFINITIONS("-D_EMULATOR") + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/aarch64/libsmart-reply-engine-en_US.so DESTINATION ${LIBDIR}) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/aarch64/libsmart-reply-engine-ko_KR.so DESTINATION ${LIBDIR}) +else() + ADD_DEFINITIONS("-D_EMULATOR") + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/x86_64/libsmart-reply-engine-en_US.so DESTINATION ${LIBDIR}) + INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/lib/x86_64/libsmart-reply-engine-ko_KR.so DESTINATION ${LIBDIR}) +endif() #install resources INSTALL ( diff --git a/packaging/smartreply-service.spec b/packaging/smartreply-service.spec index 117e871..306b1bb 100755 --- a/packaging/smartreply-service.spec +++ b/packaging/smartreply-service.spec @@ -25,11 +25,6 @@ Requires(post): /usr/bin/systemctl Requires(post): /usr/bin/sqlite3 Requires(postun): /usr/bin/systemctl -%ifarch %{arm} -%define ARCH arm -%else -%define ARCH i586 -%endif %description SmartReply-Service @@ -62,7 +57,7 @@ export FFLAGS+=" -DTIZEN_ENGINEER_MODE" rm -rf CMakeFiles rm -rf CMakeCache.txt -%cmake . -DARCH=%{ARCH} -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?tizen_profile_name} +%cmake . -DMAJORVER=${MAJORVER} -DFULLVER=%{version} -DPROFILE=%{?tizen_profile_name} make %{?jobs:-j%jobs} %install -- 2.7.4