diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-21 16:03:23 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-21 05:33:29 +0000 |
| commit | 0a6dd513787c4dd99495ec9255b83ae398832afc (patch) | |
| tree | 7e32384ba7d263f4cae2d9eb88abc21a60e70c15 /src/third_party | |
| parent | 4648ad942c3cb883677e089bea34e37e5304eaf5 (diff) | |
| download | mongo-0a6dd513787c4dd99495ec9255b83ae398832afc.tar.gz | |
Import wiredtiger: aab32463d85c848abc2732cbcb277b85b664415a from branch mongodb-master
ref: 6b6c57899c..aab32463d8
for: 5.3.0
WT-8704 Tidy up CMake warnings on Windows builds
Diffstat (limited to 'src/third_party')
4 files changed, 13 insertions, 6 deletions
diff --git a/src/third_party/wiredtiger/cmake/configs/modes.cmake b/src/third_party/wiredtiger/cmake/configs/modes.cmake index edb1f03875c..c518a8c2a78 100644 --- a/src/third_party/wiredtiger/cmake/configs/modes.cmake +++ b/src/third_party/wiredtiger/cmake/configs/modes.cmake @@ -93,13 +93,18 @@ function(define_build_mode mode) set(CMAKE_SHARED_LINKER_FLAGS_${build_mode} "${linker_flags}" CACHE STRING - "Linker lags to be used to create shared libraries for ${mode} build type." FORCE) + "Linker flags to be used to create shared libraries for ${mode} build type." FORCE) + + set(CMAKE_MODULE_LINKER_FLAGS_${build_mode} + "${linker_flags}" CACHE STRING + "Linker flags to be used to create shared modules for ${mode} build type." FORCE) mark_as_advanced( CMAKE_CXX_FLAGS_${build_mode} CMAKE_C_FLAGS_${build_mode} CMAKE_EXE_LINKER_FLAGS_${build_mode} CMAKE_SHARED_LINKER_FLAGS_${build_mode} + CMAKE_MODULE_LINKER_FLAGS_${build_mode} ) set(BUILD_MODES "${BUILD_MODES};${mode}" CACHE INTERNAL "") endfunction() @@ -180,6 +185,8 @@ define_build_mode(Coverage DEPENDS "NOT MSVC" ) +define_build_mode(None) + if(NOT CMAKE_BUILD_TYPE) string(REPLACE ";" " " build_modes_doc "${BUILD_MODES}") set(CMAKE_BUILD_TYPE "None" CACHE STRING "Choose the type of build, options are: ${build_modes_doc}." FORCE) diff --git a/src/third_party/wiredtiger/cmake/configs/x86/windows/config.cmake b/src/third_party/wiredtiger/cmake/configs/x86/windows/config.cmake index e20814a2b35..695052591c9 100644 --- a/src/third_party/wiredtiger/cmake/configs/x86/windows/config.cmake +++ b/src/third_party/wiredtiger/cmake/configs/x86/windows/config.cmake @@ -22,6 +22,10 @@ add_compile_options(/Gy) add_compile_options(/Zc:wchar_t) # Use the __cdecl calling convention for all functions. add_compile_options(/Gd) +# Ignore deprecated functions. +add_compile_options(/wd4996) +# Ignore warning about mismatched const qualifiers. +add_compile_options(/wd4090) # Disable incremental linking. string(APPEND win_link_flags " /INCREMENTAL:NO") diff --git a/src/third_party/wiredtiger/cmake/strict/strict_flags_helpers.cmake b/src/third_party/wiredtiger/cmake/strict/strict_flags_helpers.cmake index eaa3d2f9fc8..a30253d1e26 100644 --- a/src/third_party/wiredtiger/cmake/strict/strict_flags_helpers.cmake +++ b/src/third_party/wiredtiger/cmake/strict/strict_flags_helpers.cmake @@ -206,10 +206,6 @@ function(get_cl_base_flags flags) # Warning level 3. list(APPEND cl_flags "/WX") - # Ignore warning about mismatched const qualifiers. - list(APPEND cl_flags "/wd4090") - # Ignore deprecated functions. - list(APPEND cl_flags "/wd4996") # Complain about unreferenced format parameter. list(APPEND cl_flags "/we4100") # Enable security check. diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 77fb4b047e8..16302dc2c83 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "6b6c57899c9e5d63baa57fc90badfb2995d6ee9d" + "commit": "aab32463d85c848abc2732cbcb277b85b664415a" } |