Skip to content

builder-module: Default to builddir true for cmake and cmake-ninja #704

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bbhtt merged 2 commits into from
Mar 10, 2026
Merged

builder-module: Default to builddir true for cmake and cmake-ninja #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c17dcd
doc: Mention that meson buildsystem uses builddir true since 0.9.9
bbhtt Feb 24, 2026
5a2a6ba
builder-module: Default to builddir true for cmake and cmake-ninja
bbhtt Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ TBD
* Disable all filesystem access in flatpak-builder --run sandbox
* Add ability to set custom fusermount path
* Support setting state-dir for run
* Default to builddir true for cmake and cmake-ninja buildsystems

Changes in 1.4.6
================
Expand Down
4 changes: 3 additions & 1 deletion doc/flatpak-manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,9 @@
</varlistentry>
<varlistentry>
<term><option>builddir</option> (boolean)</term>
<listitem><para>Use a build directory that is separate from the source directory</para></listitem>
<listitem><para>Use a build directory that is separate from the source directory. This
defaults to <literal>true</literal> for the <option>meson</option> <option>buildsystem</option>
since version 0.9.9 and since 1.5.0 for <option>cmake</option> and <option>cmake-ninja</option>.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>subdir</option> (string)</term>
Expand Down
2 changes: 1 addition & 1 deletion src/builder-module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1952,7 +1952,7 @@ builder_module_build_helper (BuilderModule *self,
}

var_require_builddir = strstr (configure_content, "buildapi-variable-require-builddir") != NULL;
use_builddir = var_require_builddir || self->builddir || meson;
use_builddir = var_require_builddir || self->builddir || meson || cmake || cmake_ninja;

if (use_builddir)
{
Expand Down