diff options
| author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2021-05-10 13:04:29 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-05-11 00:59:15 +0000 |
| commit | a2826e8269d9da7d6a6c2a91d94e6211bd1a4b88 (patch) | |
| tree | 6de3163bb2bbfe69169284094d7b5f518a42815d /src/third_party/SConscript | |
| parent | 695168e61265ac07e73fa3e086d953c19439e726 (diff) | |
| download | mongo-a2826e8269d9da7d6a6c2a91d94e6211bd1a4b88.tar.gz | |
SERVER-48258 Upgrade yaml-cpp 0.6.3
Diffstat (limited to 'src/third_party/SConscript')
| -rw-r--r-- | src/third_party/SConscript | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/third_party/SConscript b/src/third_party/SConscript index 87b0774c3d6..1598dd00cf6 100644 --- a/src/third_party/SConscript +++ b/src/third_party/SConscript @@ -14,7 +14,6 @@ zlibSuffix = '-1.2.11' zstdSuffix = '-1.4.4' pcreSuffix = "-8.42" mozjsSuffix = '-60' -yamlSuffix = '-0.6.2' icuSuffix = '-57.1' timelibSuffix = '-2021.06' tomcryptSuffix = '-1.18.2' @@ -155,7 +154,7 @@ if wiredtiger and not use_system_version_of_library('wiredtiger'): if not use_system_version_of_library('yaml'): thirdPartyEnvironmentModifications['yaml'] = { - 'CPPPATH' : ['#/src/third_party/yaml-cpp' + yamlSuffix + '/yaml-cpp/include'], + 'CPPPATH' : ['#/src/third_party/yaml-cpp/yaml-cpp/include'], 'CPPDEFINES' : ['_SILENCE_CXX17_ITERATOR_BASE_CLASS_DEPRECATION_WARNING'] if env.ToolchainIs('msvc') else [], } @@ -520,10 +519,10 @@ if use_system_version_of_library("yaml"): else: yamlEnv = yamlEnv.Clone() yamlEnv.InjectThirdParty(libraries=['yaml', 'boost']) - yamlEnv.SConscript('yaml-cpp' + yamlSuffix + '/SConscript', exports={ 'env' : yamlEnv }) + yamlEnv.SConscript('yaml-cpp/SConscript', exports={ 'env' : yamlEnv }) yamlEnv = yamlEnv.Clone( LIBDEPS_INTERFACE=[ - 'yaml-cpp' + yamlSuffix + '/yaml', + 'yaml-cpp/yaml', ]) yamlEnv.ShimLibrary(name="yaml") |