aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improve ConanfileProbe.

Browse Source 
Add remote option.
This commit is contained in:
Roman Telezhynskyi 2024-03-21 15:21:45 +02:00
parent f9f61069fe
commit 6d26411500
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qbs/imports/conan/ConanfileProbe.qbs
View File

@ -45,6 +45,7 @@ Probe {
property var settings property var settings
property bool verbose: false property bool verbose: false
property stringList profiles: [] property stringList profiles: []
property string remote
// Output // Output
property var dependencies property var dependencies
@ -115,6 +116,11 @@ Probe {
Utilities.getHash(args.join())); Utilities.getHash(args.join()));
args = args.concat(["-if", generatedFilesPath]); args = args.concat(["-if", generatedFilesPath]);
if (remote) {
args = args.concat(["--remote", remote]);
}
var p = new Process(); var p = new Process();
p.start(executable, args); p.start(executable, args);
while (!p.waitForFinished(500)) { while (!p.waitForFinished(500)) {

2
valentina.qbs
View File

@ -10,6 +10,7 @@ Project {
property bool enableConan: false property bool enableConan: false
property bool conanWithXerces: false property bool conanWithXerces: false
property bool conanWithCrashReporting: false property bool conanWithCrashReporting: false
property string conanRemote
property string minimumMacosVersion: undefined property string minimumMacosVersion: undefined
property string minimumQtVersion: "5.15" property string minimumQtVersion: "5.15"
property stringList conanProfiles: [] property stringList conanProfiles: []
@ -22,6 +23,7 @@ Project {
conanfilePath: project.sourceDirectory + "/conanfile.py" conanfilePath: project.sourceDirectory + "/conanfile.py"
verbose: true verbose: true
profiles: conanProfiles profiles: conanProfiles
remote: conanRemote
options: { options: {
var o = {}; var o = {};
if (conanWithXerces) if (conanWithXerces)