Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[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 <nizovn@gmail.com>
Signed-off-by: Herman van Hazendonk <github.com@herrie.org>
  • Loading branch information
Herrie82 committed Feb 18, 2018
1 parent bcdff5b commit ad085c3
Show file tree
Hide file tree
Showing 11 changed files with 18 additions and 13 deletions.
3 changes: 3 additions & 0 deletions adaptors/adaptor-config.pri
Expand Up @@ -17,3 +17,6 @@ target.path = $$PLUGINPATH

INSTALLS += target

config_hybris {
CONFIG += link_pkgconfig
}
2 changes: 1 addition & 1 deletion adaptors/hybrisaccelerometer/hybrisaccelerometer.pro
Expand Up @@ -9,5 +9,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
4 changes: 2 additions & 2 deletions adaptors/hybrisalsadaptor/hybrisalsadaptor.pro
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion adaptors/hybrisgyroscopeadaptor/hybrisgyroscopeadaptor.pro
Expand Up @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
Expand Up @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
Expand Up @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
4 changes: 2 additions & 2 deletions adaptors/hybrispressureadaptor/hybrispressureadaptor.pro
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion adaptors/hybrisproximityadaptor/hybrisproximityadaptor.pro
Expand Up @@ -10,5 +10,5 @@ LIBS+= -L../../core -lhybrissensorfw-qt5

include( ../adaptor-config.pri )
config_hybris {
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers
}
Expand Up @@ -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
}
4 changes: 3 additions & 1 deletion 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
2 changes: 1 addition & 1 deletion core/hybris.pro
Expand Up @@ -6,7 +6,7 @@ TARGET = hybrissensorfw
include( ../common-config.pri )

CONFIG += link_pkgconfig
INCLUDEPATH+=/usr/include/android
PKGCONFIG += android-headers

SENSORFW_INCLUDEPATHS = .. \
../include \
Expand Down

0 comments on commit ad085c3

Please sign in to comment.