Skip to content

Use CMake imported target for threads library #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vepadulano wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

Use CMake imported target for threads library #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ target_link_libraries(libdavix
PRIVATE ${libcurl}
PUBLIC ${LIBSSL_PKG_LIBRARIES}
${LIBXML2_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
Threads::Threads
${CMAKE_DL_LIBS}
${UUID_LIBRARIES}
${SECURE_TRANSPORT_LIBRARIES}
Expand Down Expand Up @@ -152,7 +152,7 @@ target_link_libraries(libdavix_static
PRIVATE ${libcurl}
PUBLIC ${LIBSSL_PKG_LIBRARIES}
${LIBXML2_LIBRARIES}
${CMAKE_THREAD_LIBS_INIT}
Threads::Threads
${CMAKE_DL_LIBS}
${UUID_LIBRARIES}
${SECURE_TRANSPORT_LIBRARIES}
Expand Down
8 changes: 4 additions & 4 deletions src/tools/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,22 @@ set_target_properties(davix_tool PROPERTIES
## davix ls cmd line
add_executable(davix_ls_tool davix_tool_ls_main.cpp)

target_link_libraries(davix_ls_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(davix_ls_tool davix_tool_lib libdavix Threads::Threads)
set_target_properties(davix_ls_tool PROPERTIES
OUTPUT_NAME "davix-ls")


## davix get cmd line
add_executable(davix_get_tool davix_tool_get_main.cpp)

target_link_libraries(davix_get_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(davix_get_tool davix_tool_lib libdavix pthread Threads::Threads)
set_target_properties(davix_get_tool PROPERTIES
OUTPUT_NAME "davix-get")

## davix put cmd line
add_executable(davix_put_tool davix_tool_put_main.cpp)

target_link_libraries(davix_put_tool davix_tool_lib libdavix pthread ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(davix_put_tool davix_tool_lib libdavix pthread Threads::Threads)
set_target_properties(davix_put_tool PROPERTIES
OUTPUT_NAME "davix-put")

Expand All @@ -58,7 +58,7 @@ set_target_properties(davix_mkdir_tool PROPERTIES
## davix rm cmd line
add_executable(davix_rm_tool davix_tool_rm_main.cpp)

target_link_libraries(davix_rm_tool davix_tool_lib libdavix ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(davix_rm_tool davix_tool_lib libdavix Threads::Threads)
set_target_properties(davix_rm_tool PROPERTIES
OUTPUT_NAME "davix-rm")

Expand Down
2 changes: 1 addition & 1 deletion test/bench/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ LIST(APPEND src_davix_bench "davix_bench.cpp" "chunk_queue.cpp")
#include_directories(/usr/include/davix)

add_executable(davix-bench ${src_davix_bench})
target_link_libraries(davix-bench libdavix ${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(davix-bench libdavix Threads::Threads)

function(test_read url opt input)
add_test(test_bench_read_${url} davix-bench ${opt} ${url} ${input})
Expand Down
2 changes: 1 addition & 1 deletion test/slow-unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ target_link_libraries(davix-slow-unit-tests
libdavix
GTest::GTest
GTest::Main
${CMAKE_THREAD_LIBS_INIT}
Threads::Threads
${LIBSSL_PKG_LIBRARIES}
)

Expand Down
2 changes: 1 addition & 1 deletion test/unit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ target_link_libraries(davix-unit-tests
libdavix
GTest::GTest
GTest::Main
${CMAKE_THREAD_LIBS_INIT}
Threads::Threads
${LIBSSL_PKG_LIBRARIES}
)

Expand Down