[folly] Handle boost upgrade

This commit is contained in:
Robert Schumacher 2017-12-20 23:55:38 -08:00
parent 1e7b704939
commit b7ce0db27f
3 changed files with 42 additions and 1 deletions

View File

@ -1,4 +1,4 @@
Source: folly Source: folly
Version: 2017.11.27.00-1 Version: 2017.11.27.00-2
Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows Description: An open-source C++ library developed and used at Facebook. The library is UNSTABLE on Windows
Build-Depends: zlib, openssl, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy, boost-context, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-conversion, boost-multi-index, boost-crc Build-Depends: zlib, openssl, libevent, double-conversion, glog, gflags, lz4, liblzma, snappy, boost-context, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-conversion, boost-multi-index, boost-crc

View File

@ -0,0 +1,35 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ec5a985c..36564534 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -136,13 +136,6 @@ source_group("folly\\build" FILES
)
set(FOLLY_SHINY_DEPENDENCIES
- Boost::chrono
- Boost::context
- Boost::date_time
- Boost::filesystem
- Boost::program_options
- Boost::regex
- Boost::system
OpenSSL::SSL
OpenSSL::Crypto
)
@@ -179,6 +172,7 @@ endif()
set(FOLLY_LINK_LIBRARIES
${FOLLY_LINK_LIBRARIES}
+ ${Boost_LIBRARIES}
Iphlpapi.lib
Ws2_32.lib
@@ -320,7 +314,7 @@ if (BUILD_TESTS)
)
target_link_libraries(folly_test_support
PUBLIC
- Boost::thread
+ ${Boost_LIBRARIES}
folly
${LIBGMOCK_LIBRARY}
)

View File

@ -22,6 +22,12 @@ vcpkg_from_github(
HEAD_REF master HEAD_REF master
) )
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${CMAKE_CURRENT_LIST_DIR}/cmake-link-boost-fix.cmake
)
if(VCPKG_CRT_LINKAGE STREQUAL static) if(VCPKG_CRT_LINKAGE STREQUAL static)
set(MSVC_USE_STATIC_RUNTIME ON) set(MSVC_USE_STATIC_RUNTIME ON)
else() else()