diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-17 20:13:56 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-08-20 16:04:37 +0000 |
| commit | b105f091dcd6c92e25efdfbc4018cdd76e0aeaab (patch) | |
| tree | a937e4ee9855142a48a8009e5d337898d1027564 /qbs-resources | |
| parent | c8e062829dd533035186560ae9adb88f126187c1 (diff) | |
| download | qbs-b105f091dcd6c92e25efdfbc4018cdd76e0aeaab.tar.gz | |
qbsbuild: move logging to the static library
Change-Id: I94bd7288a9ef3b7a785a76386ff7d395cdd01f81
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources')
| -rw-r--r-- | qbs-resources/imports/QbsApp.qbs | 15 | ||||
| -rw-r--r-- | qbs-resources/imports/QbsAutotest.qbs | 11 |
2 files changed, 1 insertions, 25 deletions
diff --git a/qbs-resources/imports/QbsApp.qbs b/qbs-resources/imports/QbsApp.qbs index caec90f85..5fe32046b 100644 --- a/qbs-resources/imports/QbsApp.qbs +++ b/qbs-resources/imports/QbsApp.qbs @@ -3,14 +3,11 @@ import qbs.FileInfo QbsProduct { Depends { name: "qbscore" } - Depends { name: "cpp" } Depends { name: "qbsversion" } + Depends { name: "qbsconsolelogger" } type: ["application", "qbsapplication"] version: qbsversion.version consoleApplication: true - cpp.includePaths: [ - "../shared", // for the logger - ] Group { fileTagsFilter: product.type .concat(qbs.buildVariant === "debug" ? ["debuginfo_app"] : []) @@ -19,14 +16,4 @@ QbsProduct { qbs.installSourceBase: buildDirectory } targetInstallDir: qbsbuildconfig.appInstallDir - Group { - name: "logging" - prefix: FileInfo.joinPaths(product.sourceDirectory, "../shared/logging") + '/' - files: [ - "coloredoutput.cpp", - "coloredoutput.h", - "consolelogger.cpp", - "consolelogger.h" - ] - } } diff --git a/qbs-resources/imports/QbsAutotest.qbs b/qbs-resources/imports/QbsAutotest.qbs index 5d4143a41..c26d9660e 100644 --- a/qbs-resources/imports/QbsAutotest.qbs +++ b/qbs-resources/imports/QbsAutotest.qbs @@ -16,19 +16,8 @@ QtApplication { ] cpp.includePaths: [ "../../../src", - "../../../src/app/shared", // for the logger ] cpp.cxxLanguageVersion: "c++14" - Group { - name: "logging" - prefix: FileInfo.joinPaths(product.sourceDirectory, "../../../src/app/shared/logging") + '/' - files: [ - "coloredoutput.cpp", - "coloredoutput.h", - "consolelogger.cpp", - "consolelogger.h" - ] - } cpp.rpaths: qbsbuildconfig.libRPaths qbs.commonRunEnvironment: ({ |