Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb38551' into 'master'
[sensorfw] Fixed pkgconfig version, contributes to jb#38551

See merge request mer-core/sensorfw!33
  • Loading branch information
kende committed Feb 25, 2019
2 parents 5dcd6fb + 2b8db7c commit 971ec5b
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 7 deletions.
2 changes: 1 addition & 1 deletion rpm/sensorfw-qt5-hybris.spec
Expand Up @@ -44,7 +44,7 @@ unset LD_AS_NEEDED
export LD_RUN_PATH=/usr/lib/sensord-qt5/
export QT_SELECT=5

%qmake5 CONFIG+=hybris
%qmake5 CONFIG+=hybris PC_VERSION=`echo %{version} | sed 's/+.*//'`

make %{?_smp_mflags}

Expand Down
3 changes: 2 additions & 1 deletion rpm/sensorfw-qt5.spec
Expand Up @@ -98,7 +98,8 @@ export QT_SELECT=5

%qmake5 \
CONFIG+=ssusysinfo\
CONFIG+=mce
CONFIG+=mce\
PC_VERSION=`echo %{version} | sed 's/+.*//'`

make %{?_smp_mflags}

Expand Down
11 changes: 6 additions & 5 deletions sensorfw.pro
Expand Up @@ -15,7 +15,7 @@ contains(CONFIG,autohybris) {

TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = datatypes \
SUBDIRS = datatypes \
adaptors \
core \
filters \
Expand All @@ -29,7 +29,7 @@ SUBDIRS = datatypes \
equals(QT_MAJOR_VERSION, 4): {
SUBDIRS = datatypes qt-api
}

contains(CONFIG,configs) {
# !contains(CONFIG,hybris) {
SENSORDHYBRISCONFIGFILE.files = config/sensord-hybris.conf
Expand All @@ -53,10 +53,10 @@ contains(CONFIG,configs) {

SENSORCONFIG_SETUP.files = config/sensord-daemon-conf-setup
SENSORCONFIG_SETUP.path = /usr/bin

INSTALLS += SENSORFWCONFIGFILES SENSORCONFIG_SETUP
}

contains(CONFIG,hybris) {

SUBDIRS = core/hybris.pro \
Expand All @@ -81,11 +81,13 @@ contains(CONFIG,hybris) {

equals(QT_MAJOR_VERSION, 4):{
PKGCONFIGFILES.files = sensord.pc
PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord.pc'
QTCONFIGFILES.path = /usr/share/qt4/mkspecs/features
}

equals(QT_MAJOR_VERSION, 5):{
PKGCONFIGFILES.files = sensord-qt5.pc
PKGCONFIGFILES.commands = 'sed -i "s/Version:.*/Version: $$PC_VERSION/" sensord-qt5.pc'
QTCONFIGFILES.path = /usr/share/qt5/mkspecs/features

}
Expand Down Expand Up @@ -128,4 +130,3 @@ equals(QT_MAJOR_VERSION, 5): {

}
OTHER_FILES += config/*

0 comments on commit 971ec5b

Please sign in to comment.