mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
fbthrift: Update to 2019.10.07.00
Added patch to remove boost-thread dependency.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry-picked from dbfea329d3)
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -44,7 +44,11 @@ endif(MSVC)
|
||||
find_package(
|
||||
Boost 1.54.0 REQUIRED #1.54.0 or greater
|
||||
COMPONENTS
|
||||
+ context
|
||||
+ date_time
|
||||
filesystem
|
||||
+ program_options
|
||||
+ regex
|
||||
system
|
||||
thread
|
||||
)
|
||||
@@ -0,0 +1,10 @@
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -49,7 +49,6 @@ find_package(
|
||||
program_options
|
||||
regex
|
||||
system
|
||||
- thread
|
||||
)
|
||||
include_directories(${Boost_INCLUDE_DIRS})
|
||||
|
||||
@@ -0,0 +1,11 @@
|
||||
--- a/thrift/cmake/FBThriftConfig.cmake.in
|
||||
+++ b/thrift/cmake/FBThriftConfig.cmake.in
|
||||
@@ -20,7 +20,7 @@ set_and_check(FBTHRIFT_INCLUDE_DIR "@PACKAGE_INCLUDE_INSTALL_DIR@")
|
||||
if (WIN32)
|
||||
set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1.exe")
|
||||
else()
|
||||
- set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
|
||||
+# set_and_check(FBTHRIFT_COMPILER "@PACKAGE_BIN_INSTALL_DIR@/thrift1")
|
||||
endif()
|
||||
|
||||
if (NOT TARGET FBThrift::thriftcpp2)
|
||||
Reference in New Issue
Block a user