mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 09:19:00 +08:00
[bond] Boost patch is no longer needed due to toolchain improvements.
This commit is contained in:
parent
194edb784d
commit
f06bf27397
@ -1,23 +0,0 @@
|
||||
diff --git a/cmake/Config.cmake b/cmake/Config.cmake
|
||||
index b51c76a6..4cb5a6ff 100644
|
||||
--- a/cmake/Config.cmake
|
||||
+++ b/cmake/Config.cmake
|
||||
@@ -52,7 +52,7 @@ if (MSVC)
|
||||
add_compile_options (/permissive-)
|
||||
endif()
|
||||
|
||||
- set (Boost_USE_STATIC_LIBS ON)
|
||||
+ set (Boost_USE_STATIC_LIBS OFF)
|
||||
endif (MSVC)
|
||||
|
||||
if (WIN32)
|
||||
@@ -137,9 +137,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)
|
||||
|
@ -30,9 +30,6 @@ endif()
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES
|
||||
# Change Boost_USE_STATIC_LIBS to be compatible with vcpkg's treatment
|
||||
# of Boost
|
||||
${CMAKE_CURRENT_LIST_DIR}/0001_boost_static_libs.patch
|
||||
# Don't install rapidjson from the (empty) submodule. With vcpkg, we get
|
||||
# rapidjson from vcpkg
|
||||
${CMAKE_CURRENT_LIST_DIR}/0002_omit_rapidjson.patch
|
||||
|
Loading…
Reference in New Issue
Block a user