diff options
| author |   Frederic Marec <frederic.marec@iot.bzh> | 2019-07-09 09:49:02 +0200 |
|---|---|---|
| committer |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2019-07-09 21:47:29 +0000 |
| commit | e36ec58b08c6ee79f34c2cc780849116ded52fa8 (patch) | |
| tree | 51b499d9347300fa56d46539b8eff097b734f183 /conf.d | |
| parent | e0dc747d32ce51072dd088875a89e6c9ebcb7c28 (diff) | |
Fix lua cmake dependencyicefish_8.99.1icefish/8.99.1halibut_8.0.6halibut_8.0.5halibut_8.0.4halibut_8.0.3halibut_8.0.2halibut_8.0.1halibut_8.0.0halibut_7.99.3halibut/8.0.6halibut/8.0.5halibut/8.0.4halibut/8.0.3halibut/8.0.2halibut/8.0.1halibut/8.0.0halibut/7.99.38.99.18.0.68.0.58.0.48.0.38.0.28.0.18.0.07.99.3halibut
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 <frederic.marec@iot.bzh>
Diffstat (limited to 'conf.d')
| -rw-r--r-- | conf.d/cmake/00-default-osconfig.cmake | 1 | ||||
| -rw-r--r-- | conf.d/cmake/00-suse-config.cmake | 1 | ||||
| -rw-r--r-- | conf.d/cmake/config.cmake | 3 |
3 files changed, 3 insertions, 2 deletions
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 ) |