Commit 53742745 authored by Wez Furlong's avatar Wez Furlong Committed by Facebook Github Bot

folly: force static boost linkage

Summary:
This mirrors what we use when building thrift.
Without this, boost somehow picks a mix of static and shared
libs, but the static linkage doesn't know how to find the libdir
and thus the link fails.

This bubbles up when building folly's tests, which also require
linking with glog.

Reviewed By: yfeldblum

Differential Revision: D14700315

fbshipit-source-id: a331fdb493e7af62b42833b90bd20367778642ea
parent 0fa75356
...@@ -2,6 +2,9 @@ include(CheckCXXSourceCompiles) ...@@ -2,6 +2,9 @@ include(CheckCXXSourceCompiles)
include(CheckIncludeFileCXX) include(CheckIncludeFileCXX)
include(CheckFunctionExists) include(CheckFunctionExists)
if(MSVC)
set(Boost_USE_STATIC_LIBS ON) #Force static lib in msvc
endif(MSVC)
find_package(Boost 1.51.0 MODULE find_package(Boost 1.51.0 MODULE
COMPONENTS COMPONENTS
context context
......
...@@ -475,6 +475,7 @@ if (BUILD_TESTS) ...@@ -475,6 +475,7 @@ if (BUILD_TESTS)
follybenchmark follybenchmark
folly folly
${LIBGMOCK_LIBRARIES} ${LIBGMOCK_LIBRARIES}
${GLOG_LIBRARY}
) )
apply_folly_compile_options_to_target(folly_test_support) apply_folly_compile_options_to_target(folly_test_support)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment