From 3dcd30d0631bd70b29c1c0414116f9c8086c49c3 Mon Sep 17 00:00:00 2001 From: Romain Forlot Date: Mon, 21 Aug 2017 22:36:30 +0200 Subject: Fix debian like distro module checking (on lua...) Add possibility to include cmake distro dependent files Change-Id: I6846c6068d37fef0102b350fca98e806abbc78de Signed-off-by: Romain Forlot --- conf.d/app-templates | 2 +- conf.d/cmake/00-debian-config.cmake | 1 + conf.d/cmake/config.cmake | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) create mode 100644 conf.d/cmake/00-debian-config.cmake (limited to 'conf.d') diff --git a/conf.d/app-templates b/conf.d/app-templates index 3a90fb6..de03118 160000 --- a/conf.d/app-templates +++ b/conf.d/app-templates @@ -1 +1 @@ -Subproject commit 3a90fb6f2c4518ebab484cde90919c19456dc04c +Subproject commit de031182cb49d2d0a84a09cc12c50cc6d05a37dd diff --git a/conf.d/cmake/00-debian-config.cmake b/conf.d/cmake/00-debian-config.cmake new file mode 100644 index 0000000..466c4de --- /dev/null +++ b/conf.d/cmake/00-debian-config.cmake @@ -0,0 +1 @@ +add_required_module(lua-5.3 REQUIRED lua-5.3>=5.3) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 5d35862..dc4d005 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -50,10 +50,6 @@ set (gcc_minimal_version 4.9) # When Present LUA is used by the controller # --------------------------------------------------------------- set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") -set(LUA_PKG lua>=5.3) -if(OSRELEASE MATCHES "debian") -set(LUA_PKG lua-5.3) -endif() # PKG_CONFIG required packages # ----------------------------- -- cgit 1.2.3-korg