summaryrefslogtreecommitdiffstats
path: root/conf.d/cmake
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-10-05 01:38:18 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-14 11:00:25 +0100
commit8df3e437f941912067231250ff5695b8a3a7fd92 (patch)
treec812fb252ad0f8a48041aff28b7fc60a75f245d1 /conf.d/cmake
parent8364673ab93eb484e25c7c4776e5d705b73330b4 (diff)
LUA lib and bin embedded in project
Change-Id: I1a61b49f55e4daa305800e754a14b6041aa81b34 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d/cmake')
-rw-r--r--conf.d/cmake/00-debian-osconfig.cmake2
-rw-r--r--conf.d/cmake/00-default-osconfig.cmake2
-rw-r--r--conf.d/cmake/00-suse-config.cmake2
-rw-r--r--conf.d/cmake/config.cmake3
4 files changed, 5 insertions, 4 deletions
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
# ---------------------------