Исправлена структура проектов

This commit is contained in:
Andrey Rodionov 2017-08-05 01:05:03 +03:00
parent a4d78b3009
commit c128afabd1
3 changed files with 60 additions and 52 deletions

View File

@ -39,57 +39,6 @@ Product {
"APP_NAME=" + "\"" + product.name + "\""
]
Depends { name: "cpp" }
Export {
Depends { name: "cpp" }
cpp.includePaths: product.pubIncludePath
cpp.rpaths: [product.rLibraryPath, product.rLibraryTestPath]
}
Group {
fileTagsFilter: [
"dynamiclibrary",
"dynamiclibrary_symlink",
"dynamiclibrary_import"
]
qbs.install: true
qbs.installDir: product.applicationPath + "/" + product.rLibraryPath
}
FileTagger {
condition: publicInclude.value.length > 0
patterns: publicInclude.value
fileTags: ["publicInclude"]
}
Group {
fileTagsFilter: ["publicInclude"]
qbs.install: true
qbs.installDir: product.includePath
}
Probe {
id: publicInclude
property stringList value
property string prjDir: project.sourceDirectory
property string incDir: product.pubIncludePath + "/" + product.name
property int hack: {
//A bit of a hack to make qbs re-resolve (see QBS-996)
return File.lastModified(prjDir + "/.git/logs/HEAD");
}
configure: {
var list = File.directoryEntries(incDir, File.Files);
for(var dir in list) {
list[dir] = FileInfo.fileName(list[dir]);
}
value = list;
}
}
Probe {
id: version

59
src/main.qbs Normal file
View File

@ -0,0 +1,59 @@
import qbs.File
import qbs.FileInfo
import "../main.qbs" as SrcProduct
SrcProduct {
name: "libs"
type: "dynamiclibrary"
Export {
Depends { name: "cpp" }
cpp.includePaths: product.pubIncludePath
cpp.rpaths: [product.rLibraryPath, product.rLibraryTestPath]
}
Group {
overrideTags: false
fileTagsFilter: [
"dynamiclibrary",
"dynamiclibrary_symlink",
"dynamiclibrary_import"
]
qbs.install: true
qbs.installDir: product.applicationPath + "/" + product.rLibraryPath
}
FileTagger {
condition: publicInclude.value.length > 0
patterns: publicInclude.value
fileTags: ["publicInclude"]
}
Group {
fileTagsFilter: ["publicInclude"]
qbs.install: true
qbs.installDir: product.includePath
}
Probe {
id: publicInclude
property stringList value
property string prjDir: project.sourceDirectory
property string incDir: product.pubIncludePath + "/" + product.name
property int hack: {
//A bit of a hack to make qbs re-resolve (see QBS-996)
return File.lastModified(prjDir + "/.git/logs/HEAD");
}
configure: {
var list = File.directoryEntries(incDir, File.Files);
for(var dir in list) {
list[dir] = FileInfo.fileName(list[dir]);
}
value = list;
}
}
}

View File

@ -1,4 +1,4 @@
import "../main.qbs" as LibProduct
import "./main.qbs" as LibProduct
LibProduct {
name: "plugin"