Skip to content

Fix linking error in CMake #137

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

Closed
wants to merge 2 commits into from
Closed

Fix linking error in CMake #137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0b1c6a
Fix a missing dependency to the pthread library
jfsmig Dec 28, 2017
1bc4eac
Detect the threading library with CMake
jfsmig Dec 28, 2017
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
21 changes: 18 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,7 @@ endif()
include(CTest)
if(BUILD_TESTING)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/tests)
# no requirement on pthread
set(test_files
tests/chan.c
tests/choose.c
Expand All @@ -146,9 +147,7 @@ if(BUILD_TESTING)
tests/rbtree.c
tests/signals.c
tests/sleep.c
tests/tcp.c
tests/threads.c
tests/threads2.c)
tests/tcp.c)
foreach(test_file IN LISTS test_files)
get_filename_component(test_name ${test_file} NAME_WE)
add_executable(test_${test_name} ${test_file})
Expand All @@ -158,6 +157,22 @@ if(BUILD_TESTING)
target_link_libraries(test_${test_name} dill)
add_test(test_${test_name} tests/${test_name})
endforeach()
# requiring pthread
include(FindThreads)
if (CMAKE_USE_PTHREADS_INIT)
set(test_files
tests/threads.c
tests/threads2.c)
foreach(test_file IN LISTS test_files)
get_filename_component(test_name ${test_file} NAME_WE)
add_executable(test_${test_name} ${test_file})
set_target_properties(test_${test_name} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests
OUTPUT_NAME ${test_name})
target_link_libraries(test_${test_name} dill ${CMAKE_THREAD_LIBS_INIT})
add_test(test_${test_name} tests/${test_name})
endforeach()
endif()
endif()

# perf
Expand Down