diff options
author | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-21 22:36:30 +0200 |
---|---|---|
committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-08-21 22:36:30 +0200 |
commit | 3dcd30d0631bd70b29c1c0414116f9c8086c49c3 (patch) | |
tree | 07ab307efb2edead3477999b512ef785ee46816e /conf.d | |
parent | e4e3fc32bffa65f6d6f1f2e4bb1852141996724f (diff) |
Fix debian like distro module checking (on lua...)
Add possibility to include cmake distro dependent files
Change-Id: I6846c6068d37fef0102b350fca98e806abbc78de
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'conf.d')
m--------- | conf.d/app-templates | 0 | ||||
-rw-r--r-- | conf.d/cmake/00-debian-config.cmake | 1 | ||||
-rw-r--r-- | conf.d/cmake/config.cmake | 4 |
3 files changed, 1 insertions, 4 deletions
diff --git a/conf.d/app-templates b/conf.d/app-templates -Subproject 3a90fb6f2c4518ebab484cde90919c19456dc04 +Subproject de031182cb49d2d0a84a09cc12c50cc6d05a37d 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 # ----------------------------- |