fix: parse config.pri failed

Change-Id: I0da217ca1a976db1c354aaba7288873ca7584b11
linuxdeepin · Jan 27, 2018 · a9b3321 · a9b3321
1 parent 07acf5b
commit a9b3321
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/src/config.pri b/src/config.pri
@@ -10,17 +10,16 @@ win32* {
 }
 
 isEmpty(VERSION) {
-    PKG_CONFIG = $$first($$list(($$pkgConfigExecutable()))
-
+    PKG_CONFIG_EXE = $$first($$list($$pkgConfigExecutable()))
     isEmpty(LIB_INSTALL_DIR) {
-        dtk_version_module = $$system($$PKG_CONFIG --variable=libdir dtkcore)
+        dtk_version_module = $$system($$PKG_CONFIG_EXE --variable=libdir dtkcore)
         dtk_version_module = $$dtk_version_module/libdtk/modules/version.pri
         exists($$dtk_version_module): include($$dtk_version_module)
-        else: VERSION = $$system($$PKG_CONFIG --modversion dtkcore)
+        else: VERSION = $$system($$PKG_CONFIG_EXE --modversion dtkcore)
     } else {
         dtk_version_module = $$LIB_INSTALL_DIR/libdtk/modules/version.pri
         exists($$dtk_version_module): include($$dtk_version_module)
-        else: VERSION = $$system($$PKG_CONFIG --modversion dtkcore)
+        else: VERSION = $$system($$PKG_CONFIG_EXE --modversion dtkcore)
     }
 
     isEmpty(VERSION): error(VERSION is empty)

diff --git a/src/lib.pri b/src/lib.pri
@@ -8,6 +8,8 @@ isEmpty(LIB_INSTALL_DIR) {
     target.path = $$LIB_INSTALL_DIR
 }
 
+message("Build dtkwidget version: $${VERSION}")
+
 QMAKE_PKGCONFIG_LIBDIR = $$target.path
 QMAKE_PKGCONFIG_VERSION = $$VERSION
 QMAKE_PKGCONFIG_DESTDIR = pkgconfig