diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-05-25 09:15:08 +0300 |
| commit | 3cc8539d84f569f4829874bf36f4b44b0ceb030c (patch) | |
| tree | cc4cf6561f81b4d6b33af1dc5da888e6baff59af /cmake/pcre.cmake | |
| parent | 956d93b581b704fa56b0b6469ae35a2e79850ef4 (diff) | |
| parent | 1ace1075dc6bb02fe19802334f9d47446a17a79a (diff) | |
| download | mariadb-git-3cc8539d84f569f4829874bf36f4b44b0ceb030c.tar.gz | |
Merge 10.9 into 10.10
Diffstat (limited to 'cmake/pcre.cmake')
| -rw-r--r-- | cmake/pcre.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cmake/pcre.cmake b/cmake/pcre.cmake index b0c6b81e630..0ac834f44a6 100644 --- a/cmake/pcre.cmake +++ b/cmake/pcre.cmake @@ -43,6 +43,7 @@ MACRO(BUNDLE_PCRE2) ENDFOREACH() FOREACH(v "" "_DEBUG" "_RELWITHDEBINFO" "_RELEASE" "_MINSIZEREL") STRING(REPLACE "/WX" "" pcre2_flags${v} "${CMAKE_C_FLAGS${v}}") + SET(pcre2_flags${v} "${pcre2_flags${v}} -std=c99 ") IF(MSVC) # Suppress a warning STRING(APPEND pcre2_flags${v} " /wd4244 " ) @@ -53,8 +54,8 @@ MACRO(BUNDLE_PCRE2) ExternalProject_Add( pcre2 PREFIX "${dir}" - URL "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.zip" - URL_MD5 e101c0ca9edb4b0af103bebe78ba52b0 + URL "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.zip" + URL_MD5 798698846982ce171d881ed0d7535c2a INSTALL_COMMAND "" CMAKE_ARGS "-DCMAKE_WARN_DEPRECATED=FALSE" |