[bond] Boost patch is no longer needed due to toolchain improvements.

This commit is contained in:
Robert Schumacher 2017-11-14 01:39:59 -08:00
parent 194edb784d
commit f06bf27397
2 changed files with 0 additions and 26 deletions

View File

@ -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)

View File

@ -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