From f9c7dc1cc2e3a3109a5c4e37b2615ad78f3cf7ab Mon Sep 17 00:00:00 2001 From: Jennifer Peshansky Date: Tue, 5 Apr 2022 19:39:53 +0000 Subject: SERVER-65275 Add dependency on PCRE2 library --- src/third_party/SConscript | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/third_party/SConscript') diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 5b80a856e50..641470f56de 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -81,6 +81,11 @@ if not use_system_version_of_library('pcre'): 'CPPPATH' : ['#/src/third_party/pcre' + pcreSuffix], } +if not use_system_version_of_library('pcre2'): + thirdPartyEnvironmentModifications['pcre2'] = { + 'CPPPATH' : ['#/src/third_party/pcre2'], + } + if not use_system_version_of_library('boost'): @@ -340,6 +345,22 @@ else: pcreEnv.ShimLibrary(name="pcrecpp") +pcre2Env = env.Clone() +if use_system_version_of_library("pcre2"): + pcre2Env = pcre2Env.Clone( + SYSLIBDEPS=[ + env['LIBDEPS_PCRE2_SYSLIBDEP'], + ]) +else: + pcre2Env = pcre2Env.Clone() + pcre2Env.InjectThirdParty(libraries=['pcre2']) + pcre2Env.SConscript('pcre2' + '/SConscript', exports={ 'env' : pcre2Env }) + pcre2Env = pcre2Env.Clone( + LIBDEPS_INTERFACE=[ + 'pcre2/pcre2', + ]) + +pcre2Env.ShimLibrary(name="pcre2") boostEnv = env.Clone() if use_system_version_of_library("boost"): -- cgit v1.2.1