luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pcre2' into 'main'

Browse Source 
meson: Fix Windows build with PCRE2 as sibling subproject

See merge request GNOME/glib!3601
This commit is contained in:
Xavier Claessens 2023-10-02 10:52:38 +00:00
commit 4700e89f53
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -2105,7 +2105,7 @@ if not pcre2.found()
# static flags are automatically enabled by the subproject if it's built # static flags are automatically enabled by the subproject if it's built
# with default_library=static # with default_library=static
use_pcre2_static_flag = false use_pcre2_static_flag = false
elif host_system == 'windows' elif host_system == 'windows' and pcre2.type_name() != 'internal'
pcre2_static = cc.links('''#define PCRE2_STATIC pcre2_static = cc.links('''#define PCRE2_STATIC
#define PCRE2_CODE_UNIT_WIDTH 8 #define PCRE2_CODE_UNIT_WIDTH 8
#include <pcre2.h> #include <pcre2.h>