Skip to content

fix: the pkg-config "Requires" values #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zccrs merged 1 commit into from
Jul 30, 2019
Merged

fix: the pkg-config "Requires" values #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions dtk_build_config.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ isEmpty(DTK_MODULE_NAME): error(set DTK_MODULE_NAME first)
!contains(DTK_MODULE_NAME, ^dtk[a-z0-9]+$): error(The format of the value of DTK_MODULE_NAME is incorrect. eg: dtk[a-z0-9]+)
!isEqual(DTK_MODULE_NAME, dtkcore):!contains(QT, dtkcore): error(QT += dtkcore first)

#将首字母改为大写
defineReplace(capitalizingString) {
RAW=$$1
FIRST = $$upper($$section(RAW, "", 1, 1))
OTHERS = $$section(RAW, "", 2, -1)
return($$FIRST$$OTHERS)
}

defineTest(checkDtkVersion) {
isEmpty(VERSION) {
!isEqual(TARGET, dtkcore) {
Expand Down
7 changes: 0 additions & 7 deletions src/dtk_cmake.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,6 @@

#TODO: check cmake exist

defineReplace(capitalizingString) {
RAW=$$1
FIRST = $$upper($$section(RAW, "", 1, 1))
OTHERS = $$section(RAW, "", 2, -1)
return($$FIRST$$OTHERS)
}

!win*: {
MODULE_DEPENDS=$$find(QT, dtk*)
CMAKE_MODULE_DEPENDS=$$replace(MODULE_DEPENDS,"dtk","")
Expand Down
16 changes: 15 additions & 1 deletion src/dtk_module.prf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,13 +100,27 @@ qt_module.path = $${MKSPECS_INSTALL_DIR}/modules

INSTALLS += qt_module

PKG_MODULE_DEPENDS=$$find(QT, dtk*)

for (qt_module, QT) {
#DBus模块需要特殊处理
isEqual(qt_module, "dbus") {
PKG_MODULE_DEPENDS+=Qt5DBus
} else {
suffix = $$str_member($$qt_module, -7, -1)
#排除以private结尾的模块
!isEqual(suffix, "private"): PKG_MODULE_DEPENDS+=Qt5$$capitalizingString($$qt_module)
}
}

PKG_MODULE_DEPENDS = $$unique(PKG_MODULE_DEPENDS)

# -----------------------
# Config pkg-config
QMAKE_PKGCONFIG_VERSION = $$VERSION
QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_NAME = DTK_$$upper($$MODULE_ID)
QMAKE_PKGCONFIG_DESCRIPTION = Deepin Tool Kit $$MODULE_ID header files
QMAKE_PKGCONFIG_REQUIRES += $$MODULE_DEPENDS
QMAKE_PKGCONFIG_REQUIRES += $$PKG_MODULE_DEPENDS
QMAKE_PKGCONFIG_INCDIR = $$includes.path
QMAKE_PKGCONFIG_LIBDIR = $$target.path