Skip to content

Commit

Permalink
thrift: yarpl/rsocket should be not required deps
Browse files Browse the repository at this point in the history
Summary:
This didn't show up in our internal CI during development,
because the affected projects do their own fetches from the git repos.

Reviewed By: simpkins

Differential Revision: D13819124

fbshipit-source-id: 741742d88ac6095253c318c197b165e53f67740e
  • Loading branch information
wez authored and facebook-github-bot committed Jan 25, 2019
1 parent 9ca988f commit 163b134
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ if(lib_only OR build_all)
find_package(GFlags REQUIRED)
find_package(Glog REQUIRED)
find_package(folly CONFIG REQUIRED)
find_package(yarpl CONFIG REQUIRED)
find_package(rsocket CONFIG REQUIRED)
find_package(yarpl CONFIG)
find_package(rsocket CONFIG)
find_package(fizz CONFIG REQUIRED)
find_package(wangle CONFIG REQUIRED)
find_package(Zlib REQUIRED)
Expand Down
8 changes: 7 additions & 1 deletion thrift/lib/cpp2/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ target_link_libraries(

bypass_source_check("${RpcMetadata-cpp2-SOURCES}")
bypass_source_check("${rsocket-cpp2-SOURCES}")

if(TARGET rsocket::ReactiveSocket)
list(APPEND rsocket-cpp2-SOURCES
async/RSocketClientChannel.cpp
)
endif()

add_library(
thriftcpp2

Expand All @@ -75,7 +82,6 @@ add_library(
async/PcapLoggingHandler.cpp
async/RequestChannel.cpp
async/ResponseChannel.cpp
async/RSocketClientChannel.cpp
gen/field_ref.cpp
server/BaseThriftServer.cpp
server/Cpp2Connection.cpp
Expand Down

0 comments on commit 163b134

Please sign in to comment.