Fix app2sd library path

[platform/core/appfw/app-installers.git] / src / common / CMakeLists.txt

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index f106e69..2ad5f8b 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -11,6 +11,7 @@ AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/step/security COMMON_STEP_SECUR
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/plugins COMMON_PLUGINS_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/plugins/types COMMON_PLUGINS_TYPES_SRCS)
 AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/utils COMMON_UTILS_SRCS)
+AUX_SOURCE_DIRECTORY(${CMAKE_CURRENT_SOURCE_DIR}/installer COMMON_INSTALLER_SRCS)
 # Target - definition
 ADD_LIBRARY(${TARGET_LIBNAME_COMMON} SHARED
        ${COMMON_SRCS}
@@ -24,7 +25,8 @@ ADD_LIBRARY(${TARGET_LIBNAME_COMMON} SHARED
        ${COMMON_STEP_SECURITY_SRCS}
        ${COMMON_PLUGINS_SRCS}
        ${COMMON_PLUGINS_TYPES_SRCS}
-       ${COMMON_UTILS_SRCS})
+       ${COMMON_UTILS_SRCS}
+       ${COMMON_INSTALLER_SRCS})
 # Target - includes
 TARGET_INCLUDE_DIRECTORIES(${TARGET_LIBNAME_COMMON} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../")
 # Target - deps
@@ -50,6 +52,8 @@ APPLY_PKG_CONFIG(${TARGET_LIBNAME_COMMON} PUBLIC
   CAPI_SYSTEM_INFO_DEPS
   STORAGE_DEPS
   LIBSYSTEMD_DEPS
+  TTRACE_DEPS
+  TRUST_ANCHOR_DEPS
   Boost
 )
 
@@ -65,15 +69,17 @@ INSTALL(TARGETS ${TARGET_LIBNAME_COMMON} DESTINATION ${LIB_INSTALL_DIR})
 SET(PLUGINS_LIST_FILE_NAME plugins_list.txt)
 SET(PLUGINS_LIST_FILE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/plugins/${PLUGINS_LIST_FILE_NAME})
 
-SET(PLUGINS_LIST_INSTALL_PATH ${SHAREDIR}/app-installers)
-SET(PLUGINS_LIST_INSTALL_FILE_PATH ${PLUGINS_LIST_INSTALL_PATH}/${PLUGINS_LIST_FILE_NAME})
+SET(PLUGINS_LIST_INSTALL_PATH ${SHAREDIR}/parser-plugins)
 
-ADD_DEFINITIONS("-DPLUGINS_LIST_INSTALL_FILE_PATH=\"${PLUGINS_LIST_INSTALL_FILE_PATH}\"")
+ADD_DEFINITIONS("-DLIBDIR=\"${LIBDIR}\"")
+ADD_DEFINITIONS("-DPLUGINS_LIST_INSTALL_PATH=\"${PLUGINS_LIST_INSTALL_PATH}\"")
 IF(NOT DEFINED TIZEN_FULL_VERSION)
   MESSAGE(FATAL_ERROR "TIZEN_FULL_VERSION MUST BE defined")
 ELSE(NOT DEFINED TIZEN_FULL_VERSION)
   ADD_DEFINITIONS("-DTIZEN_FULL_VERSION=\"${TIZEN_FULL_VERSION}\"")
 ENDIF(NOT DEFINED TIZEN_FULL_VERSION)
+ADD_DEFINITIONS("-DUNPACKDIR=\"${UNPACKDIR}\"")
+ADD_DEFINITIONS("-DLOGDIR=\"${LOGDIR}\"")
 CONFIGURE_FILE(${PLUGINS_LIST_FILE_PATH}.in ${PLUGINS_LIST_FILE_PATH} @ONLY)
 INSTALL(FILES ${PLUGINS_LIST_FILE_PATH} DESTINATION ${PLUGINS_LIST_INSTALL_PATH}/)
 
@@ -82,3 +88,5 @@ CONFIGURE_FILE(app-installers.pc.in app-installers.pc @ONLY)
 INSTALL(FILES app-installers.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 INSTALL(DIRECTORY ./ DESTINATION ${INCLUDEDIR}/app-installers/common/
         FILES_MATCHING PATTERN "*.h")
+INSTALL(DIRECTORY ./installer/ DESTINATION ${INCLUDEDIR}/app-installers/common/
+        FILES_MATCHING PATTERN "*.h")