From b2b48e3bccb3b861f644545a5243b4f90b6899bb Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Mon, 14 Dec 2020 15:12:46 +0100 Subject: [PATCH] Workaround for folly not detecting libunwind.h correctly --- CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b57a7c4d..99c947f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,6 +104,15 @@ add_subdirectory(folly EXCLUDE_FROM_ALL) add_subdirectory(fbthrift EXCLUDE_FROM_ALL) add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL) +# TODO: workaround until https://github.com/facebook/folly/pull/1497 lands... +find_path(LIBUNWIND_INCLUDE_DIR NAMES libunwind.h) +if(LIBUNWIND_INCLUDE_DIR) + set_property( + DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/folly" + APPEND + PROPERTY COMPILE_DEFINITIONS "FOLLY_HAVE_LIBUNWIND=1") +endif() + set(ZSTD_LIBRARY_RELEASE "ZSTD_LIBRARY_RELEASE-NOTFOUND" CACHE FILEPATH "don't build folly with zstd" FORCE)