From e36ec58b08c6ee79f34c2cc780849116ded52fa8 Mon Sep 17 00:00:00 2001 From: Frederic Marec Date: Tue, 9 Jul 2019 09:49:02 +0200 Subject: Fix lua cmake dependency Lua dependency is still present in config.cmake Need to avoid conflict between config.cmake & 00-default-osconfig.cmake Bug-Agl: SPEC-2396 Change-Id: I2ee3e9da99d26b4d523bb269d5c305aa5ae62ef4 Signed-off-by: Frederic Marec --- conf.d/cmake/00-default-osconfig.cmake | 1 + conf.d/cmake/00-suse-config.cmake | 1 + conf.d/cmake/config.cmake | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) create mode 100644 conf.d/cmake/00-default-osconfig.cmake create mode 100644 conf.d/cmake/00-suse-config.cmake diff --git a/conf.d/cmake/00-default-osconfig.cmake b/conf.d/cmake/00-default-osconfig.cmake new file mode 100644 index 0000000..182caeb --- /dev/null +++ b/conf.d/cmake/00-default-osconfig.cmake @@ -0,0 +1 @@ +list(APPEND PKG_REQUIRED_LIST lua>=5.3) \ No newline at end of file diff --git a/conf.d/cmake/00-suse-config.cmake b/conf.d/cmake/00-suse-config.cmake new file mode 100644 index 0000000..a2b9325 --- /dev/null +++ b/conf.d/cmake/00-suse-config.cmake @@ -0,0 +1 @@ +list(APPEND PKG_REQUIRED_LIST lua>=5.3) diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake index 9f060ad..39ba9df 100644 --- a/conf.d/cmake/config.cmake +++ b/conf.d/cmake/config.cmake @@ -56,7 +56,7 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support") # PKG_CONFIG required packages # ----------------------------- -set (PKG_REQUIRED_LIST +set (PKG_REQUIRED_LIST alsa>=1.1.2 libsystemd>=222 libmicrohttpd>=0.9.55 @@ -64,7 +64,6 @@ set (PKG_REQUIRED_LIST json-c libafbwsc glib-2.0 - lua>=5.3 appcontroller afb-helpers ) -- cgit 1.2.3-korg