Skip to content

Commit

Permalink
Merge branch 'jb38551-pkgconfig-version' into 'master'
Browse files Browse the repository at this point in the history
[libcontentaction] Properly link package and .pc version. Contributes to JB#38551

See merge request mer-core/libcontentaction!7
  • Loading branch information
blam committed Dec 13, 2018
2 parents 68e187e + 263449c commit 7cee760
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 28 deletions.
2 changes: 1 addition & 1 deletion rpm/libcontentaction-qt5.spec
Expand Up @@ -62,7 +62,7 @@ This package contains the Content Action QML plugin.
%setup -q -n %{name}-%{version}

%build
%qmake5
%qmake5 "VERSION=%{version}"
make %{?_smp_mflags}

%install
Expand Down
11 changes: 0 additions & 11 deletions src/contentaction5.pc.in

This file was deleted.

24 changes: 8 additions & 16 deletions src/src.pro
Expand Up @@ -3,14 +3,8 @@ TARGET = contentaction5

include(../common.pri)

# yes, 0.0.75. libcontentaction currently has a SONAME of 0, even though the
# version numbering is 0.1. god only knows why. fix this in the future, some
# day?
VERSION = 0.0.75


QT = core xml dbus
CONFIG += link_pkgconfig hide_symbols
CONFIG += link_pkgconfig hide_symbols create_pc create_prl no_install_prl
CONFIG -= link_prl
PKGCONFIG += gio-2.0 gio-unix-2.0
PKGCONFIG += mlite5 Qt5SystemInfo
Expand Down Expand Up @@ -45,14 +39,12 @@ include.files = contentaction.h \
contentinfo.h
INSTALLS += include

PCFILE=contentaction5.pc

# handle .pc file
system(cp $${PCFILE}.in $$PCFILE)
system(sed -i "s/\\@VERSION\\@/$$VERSION/g" $$PCFILE)

pcfiles.files = $$PCFILE
pcfiles.path = $$[QT_INSTALL_LIBS]/pkgconfig
INSTALLS += pcfiles
QMAKE_PKGCONFIG_NAME = $$TARGET
QMAKE_PKGCONFIG_DESCRIPTION = Library for associating content with actions
QMAKE_PKGCONFIG_LIBDIR = $$target.path
QMAKE_PKGCONFIG_INCDIR = $$include.path
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_REQUIRES = Qt5Core
QMAKE_PKGCONFIG_VERSION = $$VERSION

OTHER_FILES += doc.h

0 comments on commit 7cee760

Please sign in to comment.