From f29fa9083283bc1ea0981e4523b0bf9c4e9d45d0 Mon Sep 17 00:00:00 2001 From: "HaJun, Sung" Date: Fri, 19 Jun 2015 16:54:35 +0900 Subject: [PATCH] Fix to support aarch64 build Change-Id: I231cfea03d9aa3d05fb7e95dd9c97b64ba65c01d Signed-off-by: HaJun, Sung --- CMakeLists.txt | 2 +- adaptor/CMakeLists.txt | 8 ++++---- client/CMakeLists.txt | 4 ++-- common/CMakeLists.txt | 6 +++--- packaging/service-adaptor.spec | 1 + 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6584338..ed2d584 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ ADD_SUBDIRECTORY(test) ########################################################## CONFIGURE_FILE(service-adaptor.pc.in service-adaptor.pc @ONLY) -INSTALL(FILES ${CMAKE_BINARY_DIR}/service-adaptor.pc DESTINATION lib/pkgconfig) +INSTALL(FILES ${CMAKE_BINARY_DIR}/service-adaptor.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) # LICENSE file INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/service-adaptor) diff --git a/adaptor/CMakeLists.txt b/adaptor/CMakeLists.txt index cf3e86f..57d751e 100644 --- a/adaptor/CMakeLists.txt +++ b/adaptor/CMakeLists.txt @@ -56,7 +56,7 @@ TARGET_LINK_LIBRARIES(${AUTH-LIB} ${auth_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${AUTH-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${AUTH-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${AUTH-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${AUTH-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ########################################################## @@ -94,7 +94,7 @@ TARGET_LINK_LIBRARIES(${CONTACT-LIB} ${contact_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${CONTACT-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${CONTACT-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${CONTACT-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${CONTACT-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ########################################################## @@ -133,7 +133,7 @@ TARGET_LINK_LIBRARIES(${STORAGE-LIB} ${storage_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${STORAGE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${STORAGE-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${STORAGE-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${STORAGE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ########################################################## # Define resource adaptor lib @@ -170,4 +170,4 @@ TARGET_LINK_LIBRARIES(${RESOURCE-LIB} ${resource_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${RESOURCE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${RESOURCE-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${RESOURCE-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${RESOURCE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 59925a8..28fe269 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -56,7 +56,7 @@ TARGET_LINK_LIBRARIES(${ADAPTOR-CLIENT-LIB} ${adaptor_client_pkgs_LDFLAGS} sal-c SET_TARGET_PROPERTIES(${ADAPTOR-CLIENT-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${ADAPTOR-CLIENT-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${ADAPTOR-CLIENT-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${ADAPTOR-CLIENT-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) SET(SAL-ADAPTOR-CLIENT-HEADERS ${CMAKE_SOURCE_DIR}/include/service_adaptor.h @@ -111,7 +111,7 @@ TARGET_LINK_LIBRARIES(${PLUGIN-CLIENT-LIB} ${plugin_client_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${PLUGIN-CLIENT-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${PLUGIN-CLIENT-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${PLUGIN-CLIENT-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${PLUGIN-CLIENT-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) SET(SAL-PLUGIN-CLIENT-HEADERS ${CMAKE_SOURCE_DIR}/include/service_provider.h diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index c755981..5a074c8 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -49,7 +49,7 @@ TARGET_LINK_LIBRARIES(${COMMON-BASE-LIB} ${common_base_pkgs_LDFLAGS}) SET_TARGET_PROPERTIES(${COMMON-BASE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${COMMON-BASE-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${COMMON-BASE-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${COMMON-BASE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ########################################################## # Define common server @@ -93,7 +93,7 @@ TARGET_LINK_LIBRARIES(${COMMON-SERVER-LIB} ${common_server_pkgs_LDFLAGS} sal-com SET_TARGET_PROPERTIES(${COMMON-SERVER-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${COMMON-SERVER-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${COMMON-SERVER-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${COMMON-SERVER-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) ########################################################## # Define common client @@ -133,4 +133,4 @@ TARGET_LINK_LIBRARIES(${COMMON-CLIENT-LIB} ${common_client_pkgs_LDFLAGS} sal-com SET_TARGET_PROPERTIES(${COMMON-CLIENT-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR}) SET_TARGET_PROPERTIES(${COMMON-CLIENT-LIB} PROPERTIES VERSION ${VERSION}) -INSTALL(TARGETS ${COMMON-CLIENT-LIB} DESTINATION lib COMPONENT RuntimeLibraries) +INSTALL(TARGETS ${COMMON-CLIENT-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries) diff --git a/packaging/service-adaptor.spec b/packaging/service-adaptor.spec index 1cef723..ed0b387 100644 --- a/packaging/service-adaptor.spec +++ b/packaging/service-adaptor.spec @@ -49,6 +49,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE" %endif cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \ + -DLIB_INSTALL_DIR:PATH=%{_libdir} make %{?_smp_mflags} -- 2.7.4