diff options
| author | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-10-22 13:25:37 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2013-10-22 13:58:50 +0200 |
| commit | fbe28faf9898f4ded5e9e5e21054891954e4bdd1 (patch) | |
| tree | 2be2a8fa6a23aa57f4a705b2c13edc8f4153c2f6 | |
| parent | aba480caf92637ee682ba44c928fce61e82cdbee (diff) | |
fix Windows build
When setting VERSION, qmake adds the major version number to the lib
name on Windows. We need to take this into account in use.pri.
Change-Id: I45ed925cb6b0de8528ab3c025da7b3d269651d8c
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | qbs_version.pri | 1 | ||||
| -rw-r--r-- | src/lib/use.pri | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/qbs_version.pri b/qbs_version.pri index 19bec18ea..2669469c0 100644 --- a/qbs_version.pri +++ b/qbs_version.pri @@ -1,2 +1,3 @@ QBS_VERSION = 1.1.0 +QBS_VERSION_MAJ = $$section(QBS_VERSION, ., 0, 0) DEFINES += QBS_VERSION=\\\"$$QBS_VERSION\\\" diff --git a/src/lib/use.pri b/src/lib/use.pri index ac244e7ca..28e6d9df3 100644 --- a/src/lib/use.pri +++ b/src/lib/use.pri @@ -1,3 +1,5 @@ +include(../../qbs_version.pri) + isEmpty(QBSLIBDIR) { QBSLIBDIR = $$OUT_PWD/../../../lib } @@ -15,10 +17,10 @@ unix { win32 { CONFIG(debug, debug|release) { - QBSCORELIB = qbscored + QBSCORELIB = qbscored$$QBS_VERSION_MAJ } CONFIG(release, debug|release) { - QBSCORELIB = qbscore + QBSCORELIB = qbscore$$QBS_VERSION_MAJ } win32-msvc* { LIBS += /LIBPATH:$$QBSLIBDIR |