diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-27 15:03:08 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-02-27 15:19:48 +0100 |
| commit | 3e746e4741513dabf60f43efab938d8fc94cd1be (patch) | |
| tree | e32614c2b9963c9f7af21b307d74a711eeecc4ed /src/app/qbs | |
| parent | 670bb104695ac80252bed4e15da116c324b50937 (diff) | |
Make the "lib" part of plugin and library locations configurable.
Can now be set to e.g. "lib64" if required.
Task-number: QBS-343
Change-Id: I6f34ade37f39400cc5fde63133a464565feb34c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/app/qbs')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 3 | ||||
| -rw-r--r-- | src/app/qbs/qbs.pro | 3 | ||||
| -rw-r--r-- | src/app/qbs/qbs.qbs | 5 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index 09e14831f..62c3dd5fd 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -143,7 +143,8 @@ void CommandLineFrontend::start() profileName = m_settings->defaultProfile(); const Preferences prefs(m_settings, profileName); params.setSearchPaths(prefs.searchPaths(qbsRootPath)); - params.setPluginPaths(prefs.pluginPaths(qbsRootPath + QLatin1String("/lib"))); + params.setPluginPaths(prefs.pluginPaths(qbsRootPath + + QLatin1String("/" QBS_LIBRARY_DIRNAME))); params.setBuildRoot(buildDirectory(profileName)); params.setBuildConfiguration(baseConfig); params.setOverriddenValues(userConfig); diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index 9e4553c53..cc48c5c78 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -19,3 +19,6 @@ HEADERS += \ commandlinefrontend.h \ qbstool.h \ ../shared/qbssettings.h + +include(../../library_dirname.pri) +DEFINES += QBS_LIBRARY_DIRNAME=\\\"$${QBS_LIBRARY_DIRNAME}\\\" diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs index db3b9fad9..71a89c43b 100644 --- a/src/app/qbs/qbs.qbs +++ b/src/app/qbs/qbs.qbs @@ -5,7 +5,10 @@ import "../../../version.js" as Version QbsApp { name: "qbs_app" targetName: "qbs" - cpp.defines: ["QBS_VERSION=\"" + Version.qbsVersion() + "\""] + cpp.defines: base.concat([ + 'QBS_VERSION="' + Version.qbsVersion() + '"', + 'QBS_LIBRARY_DIRNAME="' + project.libDirName + '"' + ]) files: [ "../shared/qbssettings.h", "application.cpp", |