diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-11-04 17:50:12 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-11-05 10:48:13 +0100 |
| commit | d99d228851096e829e3445e08aa5f27ce1dab680 (patch) | |
| tree | 277d56b99b2eb1595baf60c12a31d64a023e2695 /src | |
| parent | 27abb692372566e5d5c7c75babd989cc9a2bf417 (diff) | |
fix use_installed.pri
The lib version number must be taken into account.
Change-Id: Ic97dc43ef526e8f528c94ed15d92e498b143fc7d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/lib.pro | 2 | ||||
| -rw-r--r-- | src/lib/lib.qbs | 5 | ||||
| -rw-r--r-- | src/lib/use_installed.pri | 10 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/lib/lib.pro b/src/lib/lib.pro index e1ac1c256..14c24a083 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -59,7 +59,7 @@ win32 { !qbs_no_dev_install { qbs_h.files = qbs.h qbs_h.path = $${QBS_INSTALL_PREFIX}/include/qbs - use_pri.files = use_installed.pri + use_pri.files = use_installed.pri ../../qbs_version.pri use_pri.path = $${qbs_h.path} INSTALLS += qbs_h use_pri } diff --git a/src/lib/lib.qbs b/src/lib/lib.qbs index 5926ee006..e30f142e9 100644 --- a/src/lib/lib.qbs +++ b/src/lib/lib.qbs @@ -321,7 +321,10 @@ Product { } Group { name: "use_installed.pri" - files: "use_installed.pri" + files: [ + "use_installed.pri", + "../../qbs_version.pri" + ] qbs.install: project.installApiHeaders qbs.installDir: headerInstallPrefix } diff --git a/src/lib/use_installed.pri b/src/lib/use_installed.pri index 3129232db..4f9a4beea 100644 --- a/src/lib/use_installed.pri +++ b/src/lib/use_installed.pri @@ -1,3 +1,5 @@ +include(qbs_version.pri) + QT += script xml QBSLIBDIR=$${PWD}/../../lib @@ -7,12 +9,16 @@ unix { !disable_rpath:unix:QMAKE_LFLAGS += -Wl,-rpath,$${QBSLIBDIR} +CONFIG(shared, static|shared) { + QBSCORELIBSUFFIX = $$QBS_VERSION_MAJ +} + win32 { CONFIG(debug, debug|release) { - QBSCORELIB = qbscored + QBSCORELIB = qbscored$$QBSCORELIBSUFFIX } CONFIG(release, debug|release) { - QBSCORELIB = qbscore + QBSCORELIB = qbscore$$QBSCORELIBSUFFIX } win32-msvc* { LIBS += /LIBPATH:$$QBSLIBDIR |