aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRomain Forlot <romain.forlot@iot.bzh>2017-08-22 12:17:35 +0200
committerRomain Forlot <romain.forlot@iot.bzh>2017-08-22 12:18:07 +0200
commit0b718e49e2ae9e99247d3b5c31bb3fa24e08caab (patch)
tree34865b6623366c7287b806348ced2a96e312b2be
parent3dcd30d0631bd70b29c1c0414116f9c8086c49c3 (diff)
Handle LUA module checking by distro
Change-Id: I6703f2225cd9ec44c7bcc4f6048b1ad7c818236d Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
m---------conf.d/app-templates0
-rw-r--r--conf.d/cmake/00-fedora-config.cmake1
-rw-r--r--conf.d/cmake/00-suse-config.cmake1
-rw-r--r--conf.d/cmake/config.cmake5
4 files changed, 4 insertions, 3 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates
-Subproject de031182cb49d2d0a84a09cc12c50cc6d05a37d
+Subproject 2e8abc421151b81272f7ab988e494fd29eb431f
diff --git a/conf.d/cmake/00-fedora-config.cmake b/conf.d/cmake/00-fedora-config.cmake
new file mode 100644
index 0000000..7b4a99a
--- /dev/null
+++ b/conf.d/cmake/00-fedora-config.cmake
@@ -0,0 +1 @@
+add_required_module(lua REQUIRED lua>=5.3)
diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake
new file mode 100644
index 0000000..7b4a99a
--- /dev/null
+++ b/conf.d/cmake/00-suse-config.cmake
@@ -0,0 +1 @@
+add_required_module(lua REQUIRED lua>=5.3)
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index dc4d005..d5607e9 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -56,11 +56,10 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
set (PKG_REQUIRED_LIST
alsa>=1.1.2
libsystemd>=222
- libmicrohttpd>=0.9.55
+ libmicrohttpd>=0.9.55
afb-daemon
json-c
- libafbwsc
- ${LUA_PKG}
+ libafbwsc
)
# Controller project needed variables.