Support for aarch64 build

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a876ee9..41d6d7e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ ADD_SUBDIRECTORY(test)
 ##########################################################
 
 CONFIGURE_FILE(service-discovery.pc.in service-discovery.pc @ONLY)
-INSTALL(FILES ${CMAKE_BINARY_DIR}/service-discovery.pc DESTINATION lib/pkgconfig)
+INSTALL(FILES ${CMAKE_BINARY_DIR}/service-discovery.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 # LICENSE file
 INSTALL(FILES ${CMAKE_SOURCE_DIR}/LICENSE.APLv2 DESTINATION /usr/share/license/service-discovery)

diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 3340f15..4359340 100644 (file)
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -51,7 +51,7 @@ TARGET_LINK_LIBRARIES(${CORE-LIB} ${core_pkgs_LDFLAGS})
 SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES SOVERSION ${VERSION_MAJOR})
 SET_TARGET_PROPERTIES(${CORE-LIB} PROPERTIES VERSION ${VERSION})
 
-INSTALL(TARGETS ${CORE-LIB} DESTINATION lib COMPONENT RuntimeLibraries)
+INSTALL(TARGETS ${CORE-LIB} DESTINATION ${LIB_INSTALL_DIR} COMPONENT RuntimeLibraries)
 
 SET(USD-CORE-HEADERS
         ${CMAKE_SOURCE_DIR}/include/service_discovery.h

diff --git a/packaging/service-discovery.spec b/packaging/service-discovery.spec
index 44ece59..6945245 100644 (file)
--- a/packaging/service-discovery.spec
+++ b/packaging/service-discovery.spec
@@ -39,6 +39,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-discovery.pc.in b/service-discovery.pc.in
index 04e551f..17c1ed7 100644 (file)
--- a/service-discovery.pc.in
+++ b/service-discovery.pc.in
@@ -1,5 +1,5 @@
 prefix=/usr
-libdir=${prefix}/lib
+libdir=@LIB_INSTALL_DIR@
 includedir=${prefix}/include
 
 Name: service-discovery library