Fix build issue 20/231720/1 submit/tizen/20200424.032838
authorsooyeon.kim <sooyeon.kim@samsung.com>
Fri, 24 Apr 2020 02:50:27 +0000 (11:50 +0900)
committersooyeon.kim <sooyeon.kim@samsung.com>
Fri, 24 Apr 2020 02:50:27 +0000 (11:50 +0900)
Change-Id: I1a977ffcd64611076c2e8e85b56c8ccddb80bf5f
Signed-off-by: sooyeon.kim <sooyeon.kim@samsung.com>
CMakeLists.txt
packaging/org.tizen.vc-engine-default.spec

index 79c917e..4929b83 100644 (file)
@@ -49,17 +49,20 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/res/OnDeviceE2EASR.ko_KR.conf DESTINATION ${AP
 ELSEIF("${ARCH}" MATCHES "^i586.*")
 SET(INSTALL_ARCH i586)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 ELSEIF("${ARCH}" MATCHES "^i686.*")
 SET(INSTALL_ARCH i586)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/i586/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 ELSEIF("${ARCH}" MATCHES "^aarch64.*")
 SET(INSTALL_ARCH aarch64)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/aarch64/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 ELSEIF("${ARCH}" MATCHES "^x86_64.*")
 SET(INSTALL_ARCH x86_64)
 INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/bin/x86_64/org.tizen.vc-engine-default DESTINATION ${APP_INSTALL_PREFIX}/bin/)
+INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 ENDIF()
 
-INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/engine_data/ DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/engine_data)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/vc-default-info.xml DESTINATION ${TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/)
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/org.tizen.vc-engine-default.xml DESTINATION ${APP_MANIFESTDIR})
index 8454bb9..6ffa6a6 100644 (file)
@@ -45,9 +45,13 @@ exit 0
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
 %{APP_PREFIX}/bin/*
-%{APP_PREFIX}/lib/*
 %{MANIFESTDIR}/org.tizen.vc-engine-default.xml
+%ifarch %{arm} # arm armv7l
+%{APP_PREFIX}/lib/*
 %{APP_PREFIX}/shared/res/*
+%else
+%{TZ_SYS_RO_SHARE}/voice/vc/engine_data/*
+%endif
 #%{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine/lib*.so
 %{TZ_SYS_RO_SHARE}/voice/vc/1.0/engine-info/vc-default-info.xml
-%{TZ_SYS_RO_SHARE}/voice/vc/engine_data/*
+