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

[swift] make sure the flow_sampling target depends on the flow Swift … (#10641) 

* [swift] make sure the flow_sampling target depends on the flow Swift generated header

* [swift] Allow the googlebenmark g++ to be used with Clang and libstdc++ combination
This commit is contained in:
Alex Lorenz 2023-07-19 02:23:01 -07:00 committed by GitHub
parent 7718e1fef0
commit 986a2438b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flow/CMakeLists.txt
View File

@ -209,4 +209,5 @@ if (WITH_SWIFT)
# TODO(swift): rdar://99107402 - this will only work once CMake 3.25 is released:
# target_link_libraries(flow PRIVATE flow_swift)
add_dependencies(flow flow_swift)
add_dependencies(flow_sampling flow_swift)
endif() # WITH SWIFT

4
flowbench/CMakeLists.txt
View File

@ -5,11 +5,11 @@ fdb_find_sources(FLOWBENCH_SRCS)
# There is no good way to incorporate the recommended googlebenchmark download + build
# process with one that checks to see if googlebenchmark has already been downloaded
# and built.
if(EXISTS /opt/googlebenchmark-f91b6b AND CLANG)
if(EXISTS /opt/googlebenchmark-f91b6b AND CLANG AND USE_LIBCXX)
add_flow_target(EXECUTABLE NAME flowbench SRCS ${FLOWBENCH_SRCS})
target_include_directories(flowbench PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" /opt/googlebenchmark-f91b6b/include)
target_link_directories(flowbench PRIVATE /opt/googlebenchmark-f91b6b/lib64)
elseif(EXISTS /opt/googlebenchmark-f91b6b-g++ AND NOT CLANG)
elseif(EXISTS /opt/googlebenchmark-f91b6b-g++ AND NOT USE_LIBCXX)
add_flow_target(EXECUTABLE NAME flowbench SRCS ${FLOWBENCH_SRCS})
target_include_directories(flowbench PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_BINARY_DIR}/include" /opt/googlebenchmark-f91b6b-g++/include)
target_link_directories(flowbench PRIVATE /opt/googlebenchmark-f91b6b-g++/lib64)