mirror of
https://github.com/MariaDB/server.git
synced 2025-01-29 02:05:57 +01:00
new pcre 10.39
This commit is contained in:
parent
53173709b3
commit
a73acf6c06
1 changed files with 4 additions and 4 deletions
|
@ -19,12 +19,12 @@ MACRO(BUNDLE_PCRE2)
|
||||||
SET(intdir)
|
SET(intdir)
|
||||||
ENDIF()
|
ENDIF()
|
||||||
|
|
||||||
SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}${CMAKE_STATIC_LIBRARY_SUFFIX})
|
SET(file ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}-static${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
# Debug libary name.
|
# Debug libary name.
|
||||||
# Same condition as in pcre2 CMakeLists.txt that adds "d"
|
# Same condition as in pcre2 CMakeLists.txt that adds "d"
|
||||||
SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}d${CMAKE_STATIC_LIBRARY_SUFFIX})
|
SET(file_d ${dir}/src/pcre2-build/${intdir}${CMAKE_STATIC_LIBRARY_PREFIX}${lib}-staticd${CMAKE_STATIC_LIBRARY_SUFFIX})
|
||||||
SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d})
|
SET_TARGET_PROPERTIES(${lib} PROPERTIES IMPORTED_LOCATION_DEBUG ${file_d})
|
||||||
ELSE()
|
ELSE()
|
||||||
SET(file_d)
|
SET(file_d)
|
||||||
|
@ -44,8 +44,8 @@ MACRO(BUNDLE_PCRE2)
|
||||||
ExternalProject_Add(
|
ExternalProject_Add(
|
||||||
pcre2
|
pcre2
|
||||||
PREFIX "${dir}"
|
PREFIX "${dir}"
|
||||||
URL "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.37/pcre2-10.37.zip"
|
URL "https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.39/pcre2-10.39.zip"
|
||||||
URL_MD5 8c1699a725d4b28410adf4b964ebbcb7
|
URL_MD5 e101c0ca9edb4b0af103bebe78ba52b0
|
||||||
INSTALL_COMMAND ""
|
INSTALL_COMMAND ""
|
||||||
CMAKE_ARGS
|
CMAKE_ARGS
|
||||||
"-DCMAKE_WARN_DEPRECATED=FALSE"
|
"-DCMAKE_WARN_DEPRECATED=FALSE"
|
||||||
|
|
Loading…
Add table
Reference in a new issue