From c4b8105eabe643de91dc89c076256dd3bf5198fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Wed, 1 Jul 2026 11:44:01 +0200 Subject: [PATCH 1/2] Fix broken Meson build when SQLITECPP_DISABLE_STD_FILESYSTEM is set The option branch appended to an undefined sqlitecpp_cxx_flags variable, so Meson erred out instead of defining the macro. Append to sqlitecpp_args like every other option branch, so the flag actually reaches the compiler. --- meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 2018b1a0..473e0896 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,7 @@ endif ## C++17 disable the support for std::filesystem (by default off) if get_option('SQLITECPP_DISABLE_STD_FILESYSTEM') - sqlitecpp_cxx_flags += ['-DSQLITECPP_DISABLE_STD_FILESYSTEM'] + sqlitecpp_args += ['-DSQLITECPP_DISABLE_STD_FILESYSTEM'] endif ## get the user option for the SQLITECPP_DISABLE_SQLITE3_EXPANDED_SQL From af616e91f53a5bfe81df21c695ba360f7e14b1d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Rombauts?= Date: Wed, 1 Jul 2026 11:49:30 +0200 Subject: [PATCH 2/2] Add CHANGELOG entry for the Meson SQLITECPP_DISABLE_STD_FILESYSTEM fix (#560) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 374dd5cd..e64e028c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -311,3 +311,4 @@ Version 3.4.0 - 2026 ??? - Fix Database::getHeaderInfo() signed-shift UB and use fixed-width types for the Header struct (#558) - Fix Savepoint destructor to catch all exceptions and track rollback state to avoid std::terminate (#559) - Fix Transaction destructor to catch all exceptions to avoid std::terminate (#559) +- Fix the Meson build when the SQLITECPP_DISABLE_STD_FILESYSTEM option is enabled (#560)