Skip to content

Commit 2f75097

Browse files
committed
ProjectBuildConfig: fix meson binaries parsing
I messed up the meson build in a previous commit. Meaning, v0.0.11 is broken. OK...
1 parent 702e053 commit 2f75097

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

src/plugins/ProjectManager/ProjectBuildConfig.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -679,14 +679,15 @@ auto ProjectBuildConfig::updateBinariesMeson() -> void {
679679

680680
auto output = process.readAllStandardOutput();
681681
if (output.isEmpty()) {
682-
qCritical() << "No output from meson introspect.";
682+
qCritical() << "updateBinariesMeson: No output from meson introspect.";
683683
return {};
684684
}
685685

686686
auto parseError = QJsonParseError();
687687
auto doc = QJsonDocument::fromJson(output, &parseError);
688688
if (parseError.error != QJsonParseError::NoError) {
689-
qCritical() << "Failed to parse JSON:" << parseError.errorString();
689+
qCritical() << "updateBinariesMeson: Failed to parse JSON:" << parseError.errorString()
690+
<< output << " builddir:" << buildDir;
690691
return {};
691692
}
692693

@@ -707,7 +708,9 @@ auto ProjectBuildConfig::updateBinariesMeson() -> void {
707708
return result;
708709
};
709710

710-
auto executables = findMesonExecutables(this->sourceDir, this->buildDir);
711+
auto sourceDir = expand(this->sourceDir);
712+
auto buildDir = expand(this->buildDir);
713+
auto executables = findMesonExecutables(sourceDir, buildDir);
711714
this->executables.clear();
712715
for (auto it = executables.constBegin(); it != executables.constEnd(); ++it) {
713716
auto name = it.key();

0 commit comments

Comments
 (0)