mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-21 00:57:50 +08:00
27 lines
820 B
Diff
27 lines
820 B
Diff
|
diff --git a/cmake/WtFindBoost-cmake.txt b/cmake/WtFindBoost-cmake.txt
|
||
|
|
index b66741f..377cede 100644
|
||
|
|
--- a/cmake/WtFindBoost-cmake.txt
|
||
|
|
+++ b/cmake/WtFindBoost-cmake.txt
|
||
|
|
@@ -99,7 +99,7 @@ IF (Boost_FOUND)
|
||
|
|
SET(BOOST_WTHTTP_MT_FOUND TRUE)
|
||
|
|
SET(BOOST_WTHTTP_FOUND TRUE)
|
||
|
|
|
||
|
|
- IF(MSVC)
|
||
|
|
+ IF(MSVC AND NOT DISABLE_BOOST_AUTOLINK)
|
||
|
|
# use autolink
|
||
|
|
SET(BOOST_WT_LIBRARIES "")
|
||
|
|
SET(BOOST_WTHTTP_LIBRARIES "")
|
||
|
|
diff --git a/src/wt/Dbo/CMakeLists.txt b/src/wt/Dbo/CMakeLists.txt
|
||
|
|
index 64d3af2..f9c31e0 100644
|
||
|
|
--- a/src/wt/Dbo/CMakeLists.txt
|
||
|
|
+++ b/src/wt/Dbo/CMakeLists.txt
|
||
|
|
@@ -31,7 +31,7 @@ IF(ENABLE_LIBWTDBO)
|
||
|
|
StringStream.C
|
||
|
|
)
|
||
|
|
|
||
|
|
- IF(MSVC)
|
||
|
|
+ IF(MSVC AND NOT DISABLE_BOOST_AUTOLINK)
|
||
|
|
#win32 links automatically against boost libs; specifying too much causes
|
||
|
|
#trouble
|
||
|
|
IF(MULTI_THREADED_BUILD)
|