From 5bf1bd00335d0c95c54de426a02da2a98257fedb Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Fri, 30 Sep 2016 18:33:12 -0700 Subject: Port qtsensors to the new configure framework Don't invoke pkg-config at build time, automatically check for sensorfw and compile the correct plugin if found. Change-Id: I30dcd41cdebd7cf082cec66f3122c24fbab5c893 Reviewed-by: Oswald Buddenhagen Reviewed-by: Robin Burchell --- src/sensors/configure.json | 32 ++++++++++++++++++++++++++++++++ src/sensors/doc/src/sensorfwbackend.qdoc | 4 ---- 2 files changed, 32 insertions(+), 4 deletions(-) create mode 100644 src/sensors/configure.json (limited to 'src/sensors') diff --git a/src/sensors/configure.json b/src/sensors/configure.json new file mode 100644 index 00000000..633de2a1 --- /dev/null +++ b/src/sensors/configure.json @@ -0,0 +1,32 @@ +{ + "module": "sensors", + + "libraries": { + "sensorfw": { + "label": "sensorfw", + "sources": [ + { "type": "pkgConfig", "args": "sensord-qt5" } + ] + } + }, + + "features": { + "sensorfw": { + "label": "sensorfw", + "condition": "libs.sensorfw", + "output": [ "privateFeature" ] + } + }, + + "report": [ + ], + + "summary": [ + { + "section": "Qt Sensors", + "entries": [ + "sensorfw" + ] + } + ] +} diff --git a/src/sensors/doc/src/sensorfwbackend.qdoc b/src/sensors/doc/src/sensorfwbackend.qdoc index 0ff31f80..c3189bbc 100644 --- a/src/sensors/doc/src/sensorfwbackend.qdoc +++ b/src/sensors/doc/src/sensorfwbackend.qdoc @@ -33,9 +33,5 @@ The Sensorfw sensor backend requires the Sensorfw and sensor daemon. Sensorfw was originally used in MeeGo, and is available on : https://github.com/mer-packages/sensorfw - - To compile the sensorfw backend, you need sensorfw installed and run qmake - with CONFIG+=sensorfw - */ -- cgit v1.2.3