diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2019-12-17 01:37:59 +0400 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-12-21 10:34:02 +0100 |
| commit | 9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7 (patch) | |
| tree | 5fd6298b3dfe07cc08bd6ffebbe65081818c13ac /extra | |
| parent | ce70573f6255d2720c39309e0d41e181dab2d685 (diff) | |
| download | mariadb-git-9dadfdcde5a63a4d67f0f7a3720632bcb1d589d7.tar.gz | |
MDEV-14024 PCRE2.
Related changes in the server code.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extra/mariabackup/xb_regex.h | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/extra/mariabackup/CMakeLists.txt b/extra/mariabackup/CMakeLists.txt index 71d97886b3f..1649676e468 100644 --- a/extra/mariabackup/CMakeLists.txt +++ b/extra/mariabackup/CMakeLists.txt @@ -37,7 +37,7 @@ INCLUDE_DIRECTORIES( ) IF(NOT HAVE_SYSTEM_REGEX) - INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/pcre) + INCLUDE_DIRECTORIES(${PCRE_INCLUDES}) ENDIF() @@ -91,7 +91,7 @@ ADD_SUBDIRECTORY(crc) TARGET_LINK_LIBRARIES(mariabackup sql sql_builtins crc) IF(NOT HAVE_SYSTEM_REGEX) - TARGET_LINK_LIBRARIES(mariabackup pcreposix) + TARGET_LINK_LIBRARIES(mariabackup pcre2-posix) ENDIF() diff --git a/extra/mariabackup/xb_regex.h b/extra/mariabackup/xb_regex.h index 9b8f5789eeb..8f2f0908658 100644 --- a/extra/mariabackup/xb_regex.h +++ b/extra/mariabackup/xb_regex.h @@ -25,7 +25,8 @@ my_regex is used on Windows and native calls are used on POSIX platforms. */ #ifdef HAVE_SYSTEM_REGEX #include <regex.h> #else -#include <pcreposix.h> +#define PCRE2_STATIC 1 /* Important on Windows */ +#include <pcre2posix.h> #endif typedef regex_t* xb_regex_t; |