diff --git a/ports/folly/CONTROL b/ports/folly/CONTROL index dfd4b833e2..cc3678039a 100644 --- a/ports/folly/CONTROL +++ b/ports/folly/CONTROL @@ -1,4 +1,4 @@ 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 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 diff --git a/ports/folly/cmake-link-boost-fix.cmake b/ports/folly/cmake-link-boost-fix.cmake new file mode 100644 index 0000000000..7eb4574c42 --- /dev/null +++ b/ports/folly/cmake-link-boost-fix.cmake @@ -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} + ) diff --git a/ports/folly/portfile.cmake b/ports/folly/portfile.cmake index fc35848605..77c8cecdf5 100644 --- a/ports/folly/portfile.cmake +++ b/ports/folly/portfile.cmake @@ -22,6 +22,12 @@ vcpkg_from_github( 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) set(MSVC_USE_STATIC_RUNTIME ON) else()