apple/foundationdb
1
0
Fork 0
mirror of https://github.com/apple/foundationdb.git synced 2025-06-01 18:56:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some CMake build issues

Browse Source 
1. `-isystem ../flow/-lpthreads` was appearing as an include flag

    Due to an apparent mistake of specifying CMAKE_THREAD_LIBS_INIT
    as a system include.  The correct way to do this is to link
    against Threads::Threads, which was already done below.

2. fdbmonitor wouldn't link due to missing pthread_once

    So it also needs to link against Threads::Threads
This commit is contained in:
Alex Miller 2019-09-16 18:40:40 -07:00
parent e76f64e7bb
commit 44f1cd6219
2 changed files with 2 additions and 2 deletions

3
fdbmonitor/CMakeLists.txt

@ -4,11 +4,12 @@ add_executable(fdbmonitor ${FDBMONITOR_SRCS})
strip_debug_symbols(fdbmonitor)
assert_no_version_h(fdbmonitor)
if(UNIX AND NOT APPLE)
target_link_libraries(fdbmonitor rt)
target_link_libraries(fdbmonitor PUBLIC rt)
endif()
# FIXME: This include directory is an ugly hack. We probably want to fix this
# as soon as we get rid of the old build system
target_include_directories(fdbmonitor PRIVATE ${CMAKE_BINARY_DIR}/fdbclient)
target_link_libraries(fdbmonitor PUBLIC Threads::Threads)
fdb_install(TARGETS fdbmonitor DESTINATION fdbmonitor COMPONENT server)

1
flow/CMakeLists.txt

@ -80,7 +80,6 @@ set(FLOW_SRCS
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hgVersion.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/hgVersion.h)
add_flow_target(STATIC_LIBRARY NAME flow SRCS ${FLOW_SRCS})
target_include_directories(flow SYSTEM PUBLIC ${CMAKE_THREAD_LIBS_INIT})
target_include_directories(flow PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
if (NOT APPLE AND NOT WIN32)
set (FLOW_LIBS ${FLOW_LIBS} rt)