summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-06-28 23:31:29 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-06-28 23:31:29 +0000
commitc0e31a9a5263e5c7e9114530ee8d1bd4e4602685 (patch)
tree4aae9c45012510f70ed15a9082c6e30e4d69a353
parent02502d5c2034d0624d6a07a20a2c599f71081bed (diff)
parent50d56f353ff5ecdade442a4419e4210381904e42 (diff)
Merge changes from topic 'iio'
* changes: Add git ignore file/dir list Add missing afb-daemon dependency
-rw-r--r--.gitignore8
-rw-r--r--conf.d/cmake/config.cmake3
2 files changed, 10 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..23c5802
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+build*
+nbproject/private
+.vscode
+.stfolder
+.*.sw*
+*.tar.gz
+__*
+htdocs/node_modules
diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index e26b043..15af184 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -70,7 +70,8 @@ set (PKG_REQUIRED_LIST
libsystemd>=222
glib-2.0
gobject-2.0
- libiio
+ libiio
+ afb-daemon>=4.0
)
# Static constante definition