Skip to content

Commit 9f5bd1a

Browse files
committed
builder-module: Default to builddir true for cmake and cmake-ninja
Fixes #232
1 parent 908c6ec commit 9f5bd1a

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ TBD
99
* Disable all filesystem access in flatpak-builder --run sandbox
1010
* Add ability to set custom fusermount path
1111
* Support setting state-dir for run
12+
* Default to builddir true for cmake and cmake-ninja buildsystems
1213

1314
Changes in 1.4.6
1415
================

doc/flatpak-manifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@
562562
<term><option>builddir</option> (boolean)</term>
563563
<listitem><para>Use a build directory that is separate from the source directory. This
564564
defaults to <literal>true</literal> for the <option>meson</option> <option>buildsystem</option>
565-
since version 0.9.9.</para></listitem>
565+
since version 0.9.9 and since 1.5.0 for <option>cmake</option> and <option>cmake-ninja</option>.</para></listitem>
566566
</varlistentry>
567567
<varlistentry>
568568
<term><option>subdir</option> (string)</term>

src/builder-module.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1952,7 +1952,7 @@ builder_module_build_helper (BuilderModule *self,
19521952
}
19531953

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

19571957
if (use_builddir)
19581958
{

0 commit comments

Comments
 (0)