mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-31 05:03:22 +08:00
e235ab759e
* Updated to the 6.0.0 release of Bond. * Regenerated patches.
24 lines
636 B
Diff
24 lines
636 B
Diff
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
|
|
index d5125c70..a2eb536c 100644
|
|
--- a/cmake/Config.cmake
|
|
+++ b/cmake/Config.cmake
|
|
@@ -46,7 +46,7 @@ if (MSVC)
|
|
add_compile_options (/permissive-)
|
|
endif()
|
|
|
|
- set (Boost_USE_STATIC_LIBS ON)
|
|
+ set (Boost_USE_STATIC_LIBS OFF)
|
|
endif (MSVC)
|
|
|
|
if (WIN32)
|
|
@@ -131,9 +131,6 @@ if (DEFINED ENV{APPVEYOR} AND ("$ENV{BOND_BUILD}" STREQUAL "C++"))
|
|
endif()
|
|
endif()
|
|
|
|
-# disable Boost auto-linking
|
|
-add_definitions (-DBOOST_ALL_NO_LIB)
|
|
-
|
|
# VS2015U2 fixed a bug with atomics and emits a warning without this definition.
|
|
add_definitions (-D_ENABLE_ATOMIC_ALIGNMENT_FIX)
|
|
|