diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2015-05-09 00:50:18 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@petroules.com> | 2015-05-19 15:38:54 +0000 |
| commit | 53b8fb9889a4aeb231642a6646bb8024744e03c7 (patch) | |
| tree | d71870226b5c2d8f8d0555d6870dab1269fe4c72 /src/app | |
| parent | 55169d88a36af5ecd2b1649e7f8b99e75632f598 (diff) | |
Add support for building internal executables (libexec) as part of Qbs.
This will be used by the upcoming Java output artifact scanner.
Change-Id: I04dd36ee6a6a7913b604bdda73c14879b2854721
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/qbs/commandlinefrontend.cpp | 2 | ||||
| -rw-r--r-- | src/app/qbs/qbs.pro | 2 | ||||
| -rw-r--r-- | src/app/qbs/qbs.qbs | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/src/app/qbs/commandlinefrontend.cpp b/src/app/qbs/commandlinefrontend.cpp index e6fa0c725..b8138a39f 100644 --- a/src/app/qbs/commandlinefrontend.cpp +++ b/src/app/qbs/commandlinefrontend.cpp @@ -157,6 +157,8 @@ void CommandLineFrontend::start() + QLatin1String("/" QBS_RELATIVE_SEARCH_PATH)))); params.setPluginPaths(prefs.pluginPaths(QDir::cleanPath(QCoreApplication::applicationDirPath() + QLatin1String("/" QBS_RELATIVE_PLUGINS_PATH)))); + params.setLibexecPath(QDir::cleanPath(QCoreApplication::applicationDirPath() + + QLatin1String("/" QBS_RELATIVE_LIBEXEC_PATH))); params.setTopLevelProfile(profileName); params.setBuildVariant(buildVariant); params.setBuildRoot(buildDirectory(profileName)); diff --git a/src/app/qbs/qbs.pro b/src/app/qbs/qbs.pro index 37eda9373..783dabd6d 100644 --- a/src/app/qbs/qbs.pro +++ b/src/app/qbs/qbs.pro @@ -20,7 +20,9 @@ HEADERS += \ qbstool.h include(../../library_dirname.pri) +isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH=../libexec isEmpty(QBS_RELATIVE_PLUGINS_PATH):QBS_RELATIVE_PLUGINS_PATH=../$${QBS_LIBRARY_DIRNAME} isEmpty(QBS_RELATIVE_SEARCH_PATH):QBS_RELATIVE_SEARCH_PATH=.. +DEFINES += QBS_RELATIVE_LIBEXEC_PATH=\\\"$${QBS_RELATIVE_LIBEXEC_PATH}\\\" DEFINES += QBS_RELATIVE_PLUGINS_PATH=\\\"$${QBS_RELATIVE_PLUGINS_PATH}\\\" DEFINES += QBS_RELATIVE_SEARCH_PATH=\\\"$${QBS_RELATIVE_SEARCH_PATH}\\\" diff --git a/src/app/qbs/qbs.qbs b/src/app/qbs/qbs.qbs index 39a5559e6..e56e97960 100644 --- a/src/app/qbs/qbs.qbs +++ b/src/app/qbs/qbs.qbs @@ -7,6 +7,7 @@ QbsApp { targetName: "qbs" cpp.defines: base.concat([ 'QBS_VERSION="' + QbsFunctions.qbsVersion() + '"', + 'QBS_RELATIVE_LIBEXEC_PATH="' + project.relativeLibexecPath + '"', 'QBS_RELATIVE_SEARCH_PATH="' + project.relativeSearchPath + '"', 'QBS_RELATIVE_PLUGINS_PATH="' + project.relativePluginsPath + '"' ]) |