wbtiger
/
foundationdb
mirror of https://github.com/apple/foundationdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Additional changes from a merge commit.

This commit is contained in:
Alex Miller 2018-12-13 17:13:41 -08:00
parent 879cb31fa2
commit a982b9da72
3 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -168,7 +168,6 @@ else()
-fvisibility=hidden -fvisibility=hidden
-Wreturn-type -Wreturn-type
-fdiagnostics-color=always -fdiagnostics-color=always
-DTLS_DISABLED=1 # TODO: Add TLS support.
-fPIC) -fPIC)
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)

1
fdbrpc/CMakeLists.txt
View File

@ -21,6 +21,7 @@ set(FDBRPC_SRCS
LoadBalance.actor.h LoadBalance.actor.h
Locality.cpp Locality.cpp
Net2FileSystem.cpp Net2FileSystem.cpp
networksender.actor.h
Platform.cpp Platform.cpp
QueueModel.cpp QueueModel.cpp
ReplicationPolicy.cpp ReplicationPolicy.cpp

1
flow/CMakeLists.txt
View File

@ -85,6 +85,7 @@ if (NOT APPLE)
endif() endif()
target_link_libraries(flow PRIVATE ${FLOW_LIBS}) target_link_libraries(flow PRIVATE ${FLOW_LIBS})
target_link_libraries(flow PUBLIC boost_target Threads::Threads ${CMAKE_DL_LIBS}) target_link_libraries(flow PUBLIC boost_target Threads::Threads ${CMAKE_DL_LIBS})
target_compile_definitions(flow PUBLIC TLS_DISABLED)
if(APPLE) if(APPLE)
find_library(IO_KIT IOKit) find_library(IO_KIT IOKit)