From 727d5cc0e72837fdf1c2fb053ad5bee4d42f92a4 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Fri, 18 Jan 2019 17:21:01 +0100 Subject: Git submodules migration to separated libraries Migrate submodule to use the afb-helpers and controller libraries. Find them as packages not only link against them like before. - Remove the submodules - Remote the target link on target - Add dependencies to afb-helpers and appcontroller packages. Bug-AGL: SPEC-2139 Change-Id: I79da3a84bc1ee020924bb51f0eaed85a99ba7288 Signed-off-by: Romain Forlot --- conf.d/cmake/config.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'conf.d') diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 3fe3534..2f0f763 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -71,6 +71,8 @@ set (PKG_REQUIRED_LIST json-c libsystemd>=222 afb-daemon>=4.0 + appcontroller + afb-helpers ) # Prefix path where will be installed the files @@ -124,7 +126,7 @@ set(INSTALL_PREFIX /opt/AGL CACHE PATH "INSTALL PREFIX PATH") # -O2 # CACHE STRING "Compilation flags for RELEASE build type.") -set(CONTROL_SUPPORT_LUA 1) +add_definitions(-DCONTROL_SUPPORT_LUA=1) add_definitions(-DLUA_GLOB_PATTERN="/var/?.lua\\\;") add_definitions(-DCONTROL_PLUGIN_PATH="./var:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/var:${INSTALL_PREFIX}/${PROJECT_NAME}/lib/plugins:${INSTALL_PREFIX}/${PROJECT_NAME}/var:${CMAKE_BINARY_DIR}/package/lib/plugins:${CMAKE_BINARY_DIR}/package/var") add_definitions(-DCONTROL_CONFIG_PATH="./etc:${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/etc:${INSTALL_PREFIX}/${PROJECT_NAME}/etc:${CMAKE_BINARY_DIR}/package/etc") -- cgit 1.2.3-korg