[Release] wrt-installer_0.1.35

[framework/web/wrt-installer.git] / src / wrt-installer / CMakeLists.txt

diff --git a/src/wrt-installer/CMakeLists.txt b/src/wrt-installer/CMakeLists.txt
index 9065231..7adda4d 100644 (file)
--- a/src/wrt-installer/CMakeLists.txt
+++ b/src/wrt-installer/CMakeLists.txt
@@ -22,22 +22,29 @@ SET(WRT_INSTALLER_DIR
     ${INSTALLER_SRC_DIR}/wrt-installer
     )
 
+SET(PKG_MANAGER_DIR
+    ${INSTALLER_SRC_DIR}/pkg-manager
+    )
+
 SET(WRT_INSTALLER_SOURCES
-    ${WRT_INSTALLER_DIR}/wrt_installer.cpp
+    ${WRT_INSTALLER_DIR}/wrt-installer.cpp
     ${WRT_INSTALLER_DIR}/wrt_installer_api.cpp
     ${WRT_INSTALLER_DIR}/installer_callbacks_translate.cpp
     ${WRT_INSTALLER_DIR}/plugin_utils.cpp
     ${WRT_INSTALLER_DIR}/language_subtag_rst_tree.cpp
     ${WRT_INSTALLER_DIR}/installer_main_thread.cpp
     ${WRT_INSTALLER_DIR}/option_parser.cpp
+    ${PKG_MANAGER_DIR}/pkgmgr_signal.cpp
 )
 
 PKG_CHECK_MODULES(WRT_INSTALLER_DEPS
     pkgmgr-installer
     libpcrecpp
+    security-install
     REQUIRED)
 
 INCLUDE_DIRECTORIES(
+    ${PKG_MANAGER_DIR}
     ${WRT_INSTALLER_DEP_INCLUDES}
     ${WRT_INSTALLER_INCLUDES}
     ${WRT_INSTALLER_DEPS_INCLUDE_DIRS}
@@ -48,7 +55,6 @@ ADD_EXECUTABLE(${TARGET_INSTALLER}
     ${WRT_INSTALLER_SOURCES}
 )
 
-ADD_DEFINITIONS("-DSEPARATE_INSTALLER_FOR_DAO") # TODO do not use ifdefs!
 ADD_DEFINITIONS(${WRT_INSTALLER_DEPS_CFLAGS})
 
 TARGET_LINK_LIBRARIES(${TARGET_INSTALLER}
@@ -58,7 +64,7 @@ TARGET_LINK_LIBRARIES(${TARGET_INSTALLER}
 
 
 SET_TARGET_PROPERTIES(${TARGET_INSTALLER} PROPERTIES
-    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both -Wl"
+    LINK_FLAGS "-Wl,--as-needed -Wl,--hash-style=both"
     BUILD_WITH_INSTALL_RPATH ON
     INSTALL_RPATH_USE_LINK_PATH ON
 )