diff options
author | Ivan Komissarov <abbapoh@gmail.com> | 2020-08-17 20:45:21 +0200 |
---|---|---|
committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2020-08-20 10:30:46 +0000 |
commit | c8e062829dd533035186560ae9adb88f126187c1 (patch) | |
tree | 4f825c72d79f9c8698937afa2d5402543c1dd368 /qbs-resources/imports | |
parent | b963013ff2ead04fb0ec89ae39ab76edd6ce07be (diff) | |
download | qbs-c8e062829dd533035186560ae9adb88f126187c1.tar.gz |
qbsbuild: get rid of the QbsLibraryBase
Nothing set in there is required for static libraries. Also, we should
set the QBS_STATIC_LIBRARY macro only for the qbscore library.
Change-Id: Ia225730694358062cc57e460443142cef36674e2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'qbs-resources/imports')
-rw-r--r-- | qbs-resources/imports/QbsLibrary.qbs | 24 | ||||
-rw-r--r-- | qbs-resources/imports/QbsLibraryBase.qbs | 24 | ||||
-rw-r--r-- | qbs-resources/imports/QbsStaticLibrary.qbs | 4 |
3 files changed, 25 insertions, 27 deletions
diff --git a/qbs-resources/imports/QbsLibrary.qbs b/qbs-resources/imports/QbsLibrary.qbs index 88244a903..6fc6c7791 100644 --- a/qbs-resources/imports/QbsLibrary.qbs +++ b/qbs-resources/imports/QbsLibrary.qbs @@ -1,8 +1,30 @@ import qbs.FileInfo +import qbs.Utilities -QbsLibraryBase { +QbsProduct { + Depends { name: "cpp" } Depends { name: "Exporter.pkgconfig"; condition: generatePkgConfigFile } Depends { name: "Exporter.qbs"; condition: generateQbsModule } + Depends { name: "cpp" } + + property string visibilityType: staticBuild ? "static" : "dynamic" + property string headerInstallPrefix: "/include/qbs" + property bool hasExporter: Utilities.versionCompare(qbs.version, "1.12") >= 0 + property bool generatePkgConfigFile: qbsbuildconfig.generatePkgConfigFiles && hasExporter + property bool generateQbsModule: install && qbsbuildconfig.generateQbsModules && hasExporter + property bool staticBuild: Qt.core.staticBuild || qbsbuildconfig.staticBuild + property stringList libType: [staticBuild ? "staticlibrary" : "dynamiclibrary"] + + version: qbsversion.version + type: libType + targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name + cpp.visibility: "minimal" + cpp.defines: base.concat(visibilityType === "static" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"]) + cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined + Properties { + condition: qbs.toolchain.contains("gcc") + cpp.soVersion: version.replace(/\.\d+$/, '') + } Group { fileTagsFilter: libType.concat("dynamiclibrary_symlink") diff --git a/qbs-resources/imports/QbsLibraryBase.qbs b/qbs-resources/imports/QbsLibraryBase.qbs deleted file mode 100644 index 7dc6b5f61..000000000 --- a/qbs-resources/imports/QbsLibraryBase.qbs +++ /dev/null @@ -1,24 +0,0 @@ -import qbs -import qbs.FileInfo -import qbs.Utilities - -QbsProduct { - Depends { name: "cpp" } - version: qbsversion.version - type: libType - targetName: (qbs.enableDebugCode && qbs.targetOS.contains("windows")) ? (name + 'd') : name - cpp.defines: base.concat(visibilityType === "static" ? ["QBS_STATIC_LIB"] : ["QBS_LIBRARY"]) - cpp.sonamePrefix: qbs.targetOS.contains("darwin") ? "@rpath" : undefined - Properties { - condition: qbs.toolchain.contains("gcc") - cpp.soVersion: version.replace(/\.\d+$/, '') - } - cpp.visibility: "minimal" - property string visibilityType: staticBuild ? "static" : "dynamic" - property string headerInstallPrefix: "/include/qbs" - property bool hasExporter: Utilities.versionCompare(qbs.version, "1.12") >= 0 - property bool generatePkgConfigFile: qbsbuildconfig.generatePkgConfigFiles && hasExporter - property bool generateQbsModule: install && qbsbuildconfig.generateQbsModules && hasExporter - property bool staticBuild: Qt.core.staticBuild || qbsbuildconfig.staticBuild - property stringList libType: [staticBuild ? "staticlibrary" : "dynamiclibrary"] -} diff --git a/qbs-resources/imports/QbsStaticLibrary.qbs b/qbs-resources/imports/QbsStaticLibrary.qbs index 3342c94d5..299ca3948 100644 --- a/qbs-resources/imports/QbsStaticLibrary.qbs +++ b/qbs-resources/imports/QbsStaticLibrary.qbs @@ -1,5 +1,5 @@ -QbsLibraryBase { - staticBuild: true +QbsProduct { + type: "staticlibrary" Export { Depends { name: "cpp" } Depends { name: "Qt"; submodules: ["core"] } |