From ad085c3a3c4fd8781244a1d53089fc5564f95a48 Mon Sep 17 00:00:00 2001 From: Herman van Hazendonk Date: Sun, 18 Feb 2018 07:10:34 +0100 Subject: [PATCH] [PATCH] Replace android headers hard-coded include path with pkgconfig To allow for a more flexible approach in terms of Android headers location. Signed-off-by: Nikolay Nizov Signed-off-by: Herman van Hazendonk --- adaptors/adaptor-config.pri | 3 +++ adaptors/hybrisaccelerometer/hybrisaccelerometer.pro | 2 +- adaptors/hybrisalsadaptor/hybrisalsadaptor.pro | 4 ++-- adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro | 2 +- .../hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro | 2 +- .../hybrisorientationadaptor/hybrisorientationadaptor.pro | 2 +- adaptors/hybrispressureadaptor/hybrispressureadaptor.pro | 4 ++-- adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro | 2 +- .../hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro | 4 ++-- config.tests/hybris/hybris.pro | 4 +++- core/hybris.pro | 2 +- 11 files changed, 18 insertions(+), 13 deletions(-) diff --git a/adaptors/adaptor-config.pri b/adaptors/adaptor-config.pri index 924178c3..cfcf90f2 100644 --- a/adaptors/adaptor-config.pri +++ b/adaptors/adaptor-config.pri @@ -17,3 +17,6 @@ target.path = $$PLUGINPATH INSTALLS += target +config_hybris { + CONFIG += link_pkgconfig +} diff --git a/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro b/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro index 9dca05a5..05ec4b5a 100644 --- a/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro +++ b/adaptors/hybrisaccelerometer/hybrisaccelerometer.pro @@ -9,5 +9,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5 include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro b/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro index 94716c2c..fa384714 100644 --- a/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro +++ b/adaptors/hybrisalsadaptor/hybrisalsadaptor.pro @@ -7,7 +7,7 @@ SOURCES += hybrisalsadaptor.cpp \ hybrisalsadaptorplugin.cpp LIBS+= -L../../core -lhybrissensorfw-qt5 -include(../adaptor-config.pri ) +include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro index b3987df2..8c0c5237 100644 --- a/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro +++ b/adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5 include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro index c31ba8db..060e447d 100644 --- a/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro +++ b/adaptors/hybrismagnetometeradaptor/hybrismagnetometeradaptor.pro @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5 include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro index 4b2dc4e8..d4d5e482 100644 --- a/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro +++ b/adaptors/hybrisorientationadaptor/hybrisorientationadaptor.pro @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5 include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrispressureadaptor/hybrispressureadaptor.pro b/adaptors/hybrispressureadaptor/hybrispressureadaptor.pro index 4e177d11..59029ff2 100644 --- a/adaptors/hybrispressureadaptor/hybrispressureadaptor.pro +++ b/adaptors/hybrispressureadaptor/hybrispressureadaptor.pro @@ -7,7 +7,7 @@ SOURCES += hybrispressureadaptor.cpp \ hybrispressureadaptorplugin.cpp LIBS+= -L../../core -lhybrissensorfw-qt5 -include(../adaptor-config.pri ) +include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro index 17d91d2e..7489ab1d 100644 --- a/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro +++ b/adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5 include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro index 28b02c7e..9af199d6 100644 --- a/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro +++ b/adaptors/hybrisstepcounteradaptor/hybrisstepcounteradaptor.pro @@ -7,7 +7,7 @@ SOURCES += hybrisstepcounteradaptor.cpp \ hybrisstepcounteradaptorplugin.cpp LIBS+= -L../../core -lhybrissensorfw-qt5 -include(../adaptor-config.pri ) +include( ../adaptor-config.pri ) config_hybris { - INCLUDEPATH+=/usr/include/android + PKGCONFIG += android-headers } diff --git a/config.tests/hybris/hybris.pro b/config.tests/hybris/hybris.pro index 3810b2d1..93aa1e14 100644 --- a/config.tests/hybris/hybris.pro +++ b/config.tests/hybris/hybris.pro @@ -1,6 +1,8 @@ TEMPLATE = app -INCLUDEPATH=/usr/include/android +CONFIG += link_pkgconfig +PKGCONFIG += android-headers + TARGET = hybris SOURCES += main.cpp diff --git a/core/hybris.pro b/core/hybris.pro index fba72f6a..c38d89a6 100644 --- a/core/hybris.pro +++ b/core/hybris.pro @@ -6,7 +6,7 @@ TARGET = hybrissensorfw include( ../common-config.pri ) CONFIG += link_pkgconfig -INCLUDEPATH+=/usr/include/android +PKGCONFIG += android-headers SENSORFW_INCLUDEPATHS = .. \ ../include \