summaryrefslogtreecommitdiffstats
path: root/conf.d
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-12-20 17:13:51 +0100
committerRomain Forlot <romain.forlot@iot.bzh>2017-12-20 17:39:30 +0100
commit4d275bdc3c7227d5896edf2c2479bbc2527b0dca (patch)
tree965054d67e0275b16ddefaeef70dd2db7ae43217 /conf.d
parente9c3f4476f692680c03a562364496ce8571d4a1c (diff)
Remove embedded LUA 3rdparty
Change-Id: Ied46d7f7784b478c75758d15f018a7ff6d3533c2 Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
-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.cmake2
-rw-r--r--conf.d/wgt/config.xml.in5
5 files changed, 4 insertions, 9 deletions
diff --git a/conf.d/cmake/00-debian-osconfig.cmake b/conf.d/cmake/00-debian-osconfig.cmake
index 8f93e17..2ce0ad3 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 7a4f5b2..a2b9325 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 342d1df..8c8303b 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 f6f0e25..ce4777f 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -84,7 +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)
+list(APPEND link_libraries afb-utilities)
# Compilation options definition
# Use CMake generator expressions to specify only for a specific language
diff --git a/conf.d/wgt/config.xml.in b/conf.d/wgt/config.xml.in
index e72a08e..863ee05 100644
--- a/conf.d/wgt/config.xml.in
+++ b/conf.d/wgt/config.xml.in
@@ -21,9 +21,4 @@
<param name="low-can" value="ws" />
<param name="gps" value="ws" />
</feature>
-
- <feature name="urn:AGL:widget:file-properties">
- <param name="bin/lua" value="executable" />
- <param name="bin/luac" value="executable" />
- </feature>
</widget>