From 192dff8d81c5164b0ce8bf8862a916836a94a6e0 Mon Sep 17 00:00:00 2001 From: Marcus Holland-Moritz Date: Wed, 30 Dec 2020 12:58:08 +0100 Subject: [PATCH] Remove folly workaround --- CMakeLists.txt | 9 --------- 1 file changed, 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0eed3e56..801eb505 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -114,15 +114,6 @@ 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)