Fix to support aarch64 build

Change-Id: I90b1d812c36ccecbfdf3267623ebdabb50ace2fa
Signed-off-by: HaJun, Sung <hajun.sung@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4b35d5a..614ac5e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,7 @@ ADD_SUBDIRECTORY(test)
 ##########################################################
 
 CONFIGURE_FILE(service-federation.pc.in service-federation.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/service-federation.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/service-federation.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 # LICENSE file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/service-federation)

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 96fbac4..5191d3c 100644 (file)
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -47,7 +47,7 @@ TARGET_LINK_LIBRARIES(${COMMON-LIB} ${common_pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${COMMON-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${COMMON-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${COMMON-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${COMMON-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 SET(SVCFEDERATION-COMMON-HEADERS
         ${CMAKE_SOURCE_DIR}/include/service_federation.h

diff --git a/packaging/service-federation.spec b/packaging/service-federation.spec
index f6b1bd0..a2e0708 100644 (file)
--- a/packaging/service-federation.spec
+++ b/packaging/service-federation.spec
@@ -40,6 +40,7 @@ export FFLAGS="$FFLAGS -DTIZEN_DEBUG_ENABLE"
 %endif
 
 cmake . -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+        -DLIB_INSTALL_DIR:PATH=%{_libdir}
 
 make %{?_smp_mflags}
 

diff --git a/service-federation.pc.in b/service-federation.pc.in
index c1fcd47..9f7f3eb 100644 (file)
--- a/service-federation.pc.in
+++ b/service-federation.pc.in
@@ -1,5 +1,5 @@
 prefix=/usr
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: service-federation library

diff --git a/svcbox/CMakeLists.txt b/svcbox/CMakeLists.txt
index 5efaea8..ed2609d 100644 (file)
--- a/svcbox/CMakeLists.txt
+++ b/svcbox/CMakeLists.txt
@@ -48,4 +48,4 @@ TARGET_LINK_LIBRARIES(${SVCBOX-LIB} ${svcbox_pkgs_LDFLAGS} usf-common)
 SET_TARGET_PROPERTIES(${SVCBOX-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${SVCBOX-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${SVCBOX-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${SVCBOX-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)

diff --git a/svcflow/CMakeLists.txt b/svcflow/CMakeLists.txt
index 688563d..1f03caf 100644 (file)
--- a/svcflow/CMakeLists.txt
+++ b/svcflow/CMakeLists.txt
@@ -49,4 +49,4 @@ TARGET_LINK_LIBRARIES(${SVCFLOW-LIB} ${svcflow_pkgs_LDFLAGS} usf-common svcbox)
 SET_TARGET_PROPERTIES(${SVCFLOW-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${SVCFLOW-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${SVCFLOW-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${SVCFLOW-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)