From 0b718e49e2ae9e99247d3b5c31bb3fa24e08caab Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Tue, 22 Aug 2017 12:17:35 +0200 Subject: Handle LUA module checking by distro Change-Id: I6703f2225cd9ec44c7bcc4f6048b1ad7c818236d Signed-off-by: Romain Forlot --- conf.d/app-templates | 2 +- conf.d/cmake/00-fedora-config.cmake | 1 + conf.d/cmake/00-suse-config.cmake | 1 + conf.d/cmake/config.cmake | 5 ++--- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 conf.d/cmake/00-fedora-config.cmake create mode 100644 conf.d/cmake/00-suse-config.cmake diff --git a/conf.d/app-templates b/conf.d/app-templates index de03118..2e8abc4 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit de031182cb49d2d0a84a09cc12c50cc6d05a37dd +Subproject commit 2e8abc421151b81272f7ab988e494fd29eb431ff 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. -- cgit 1.2.3-korg