Use LIB_INSTALL_DIR to get library path 43/260543/3
authorIlho Kim <ilho159.kim@samsung.com>
Tue, 29 Jun 2021 01:38:50 +0000 (10:38 +0900)
committerIlho Kim <ilho159.kim@samsung.com>
Tue, 29 Jun 2021 01:54:13 +0000 (10:54 +0900)
The library path may vary depending on the architecture

Change-Id: If60268e6efe0026255b50ee2991e5c818f2633a2
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
CMakeLists.txt
parser/CMakeLists.txt
src/client/pkginfo_client.cc

index 9e7b8f2..135676d 100644 (file)
@@ -9,6 +9,8 @@ SET(EXEC_PREFIX "\${prefix}")
 SET(INCLUDEDIR "\${prefix}/include")
 SET(CMAKE_SKIP_BUILD_RPATH true)
 
+ADD_DEFINITIONS("-DLIB_PATH=\"${LIB_INSTALL_DIR}\"")
+
 ### Local include directories
 INCLUDE_DIRECTORIES(
   ${CMAKE_SOURCE_DIR}/include
index 776eb43..9da3eeb 100644 (file)
@@ -38,7 +38,6 @@ pkg_check_modules(parser_pkgs REQUIRED dlog libxml-2.0 glib-2.0 gio-2.0 vconf bu
 foreach(flag ${parser_pkgs_CFLAGS})
        set(parser_pkgs_CFLAGS_str "${parser_pkgs_CFLAGS_str} ${flag}")
 endforeach()
-ADD_DEFINITIONS("-DLIB_PATH=\"${LIB_INSTALL_DIR}\"")
 ## Additional flag
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -fvisibility=hidden")
 SET(EXTRA_CFLAGS "${EXTRA_CFLAGS} -g -Wall -Wno-deprecated-declarations")
index 0d79ec0..fcf5afb 100644 (file)
@@ -17,7 +17,7 @@
 #include "pkgmgrinfo_debug.h"
 #include "pkgmgrinfo_private.h"
 
-#define LIBPKGMGR_INFO "/usr/lib/libpkgmgr-info-server.so.0"
+#define LIBPKGMGR_INFO LIB_PATH "/libpkgmgr-info-server.so.0"
 #define DIRECT_ACCESS_FUNC "_request_handler_direct_access"
 
 namespace pkgmgr_client {