From 8df3e437f941912067231250ff5695b8a3a7fd92 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Thu, 5 Oct 2017 01:38:18 +0200 Subject: LUA lib and bin embedded in project Change-Id: I1a61b49f55e4daa305800e754a14b6041aa81b34 Signed-off-by: Romain Forlot --- conf.d/cmake/00-debian-osconfig.cmake | 2 +- conf.d/cmake/00-default-osconfig.cmake | 2 +- conf.d/cmake/00-suse-config.cmake | 2 +- conf.d/cmake/config.cmake | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'conf.d/cmake') diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake index 2ce0ad3..8f93e17 100644 --- a/conf.d/cmake/00-debian-osconfig.cmake +++ b/conf.d/cmake/00-debian-osconfig.cmake @@ -1 +1 @@ -list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3) +#list(APPEND PKG_REQUIRED_LIST lua-5.3>=5.3) diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake index a2b9325..7a4f5b2 100644 --- a/conf.d/cmake/00-default-osconfig.cmake +++ b/conf.d/cmake/00-default-osconfig.cmake @@ -1 +1 @@ -list(APPEND PKG_REQUIRED_LIST lua>=5.3) +#list(APPEND PKG_REQUIRED_LIST lua>=5.3) diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake index 8c8303b..342d1df 100644 --- a/conf.d/cmake/00-suse-config.cmake +++ b/conf.d/cmake/00-suse-config.cmake @@ -1,2 +1,2 @@ add_definitions(-DSUSE_LUA_INCDIR) -list(APPEND PKG_REQUIRED_LIST lua>=5.3) +#list(APPEND PKG_REQUIRED_LIST lua>=5.3) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 08f4cb0..86831e8 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -84,6 +84,7 @@ set(CMAKE_INSTALL_PREFIX $ENV{HOME}/opt) # Customize link option # ----------------------------- #list(APPEND link_libraries -an-option) +list(APPEND link_libraries afb-utilities lua-lib) # Compilation options definition # Use CMake generator expressions to specify only for a specific language @@ -162,7 +163,7 @@ set(WIDGET_TYPE application/vnd.agl.service) # This is the file that will be executed, loaded, # at launch time by the application framework. # -set(WIDGET_ENTRY_POINT lib/afb-signals-composer.so) +set(WIDGET_ENTRY_POINT afb/afb-signal-composer.so) # Optional dependencies order # --------------------------- -- cgit 1.2.3-korg