diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2019-06-04 09:52:11 -0400 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2019-06-20 11:08:32 -0400 |
| commit | 6c40059b844273f9b370a560c211ef14268f45a4 (patch) | |
| tree | f5b760d1f5282d6b5bb024164459948c059043b4 /SConstruct | |
| parent | 144f8191888b400ffc774401972ac8dff1c9d87b (diff) | |
| download | mongo-6c40059b844273f9b370a560c211ef14268f45a4.tar.gz | |
SERVER-41685 Add boost log to vendored boost
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/SConstruct b/SConstruct index 424058ab99a..024199d18d6 100644 --- a/SConstruct +++ b/SConstruct @@ -953,7 +953,7 @@ def printLocalInfo(): printLocalInfo() -boostLibs = [ "filesystem", "program_options", "system", "iostreams" ] +boostLibs = [ "filesystem", "program_options", "system", "iostreams", "thread", "log" ] onlyServer = len( COMMAND_LINE_TARGETS ) == 0 or ( len( COMMAND_LINE_TARGETS ) == 1 and str( COMMAND_LINE_TARGETS[0] ) in [ "mongod" , "mongos" , "test" ] ) @@ -2107,6 +2107,7 @@ def doConfigure(myenv): env['WIN_VERSION_MIN'] = win_version_min win_version_min = win_version_min_choices[win_version_min] env.Append( CPPDEFINES=[("_WIN32_WINNT", "0x" + win_version_min[0])] ) + env.Append( CPPDEFINES=[("BOOST_USE_WINAPI_VERSION", "0x" + win_version_min[0])] ) env.Append( CPPDEFINES=[("NTDDI_VERSION", "0x" + win_version_min[0] + win_version_min[1])] ) conf.Finish() @@ -3263,13 +3264,22 @@ def doConfigure(myenv): conf.env.Append( CPPDEFINES=[ + ("BOOST_THREAD_VERSION", "5"), "BOOST_SYSTEM_NO_DEPRECATED", "BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS", "BOOST_ENABLE_ASSERT_DEBUG_HANDLER", + "BOOST_LOG_NO_SHORTHAND_NAMES", "ABSL_FORCE_ALIGNED_ACCESS", ] ) + if link_model.startswith("dynamic"): + conf.env.AppendUnique( + CPPDEFINES=[ + "BOOST_LOG_DYN_LINK", + ] + ) + if use_system_version_of_library("boost"): if not conf.CheckCXXHeader( "boost/filesystem/operations.hpp" ): myenv.ConfError("can't find boost headers") |