Skip to content

cmake: Use Threads instead of selectively linking pthreads #263

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
ethanmusser wants to merge 2 commits into
base: master
Choose a base branch
from
Open

cmake: Use Threads instead of selectively linking pthreads #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f3cd2d3
Refactor targets to find/link `Threads::Threads`
ethanmusser Dec 22, 2025
bbc0300
Find `Threads` public API dependency
ethanmusser Dec 22, 2025
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
10 changes: 5 additions & 5 deletions source/Legacy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,12 @@ set_target_properties(MultiSense PROPERTIES PUBLIC_HEADER "${MULTISENSE_HEADERS}
# We want to link against our child libraries.
#

if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
find_package(Threads REQUIRED)
target_link_libraries(MultiSense Threads::Threads)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
target_link_libraries(MultiSense ws2_32)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
target_link_libraries(MultiSense pthread)
else()
target_link_libraries(MultiSense pthread rt)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(MultiSense rt)
endif()

include(CMakePackageConfigHelpers)
Expand Down
10 changes: 5 additions & 5 deletions source/LibMultiSense/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ set_target_properties(MultiSense PROPERTIES PUBLIC_HEADER "${MULTISENSE_HEADERS}
# We want to link against our child libraries.
#

if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
find_package(Threads REQUIRED)
target_link_libraries(MultiSense Threads::Threads)
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
target_link_libraries(MultiSense ws2_32)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
target_link_libraries(MultiSense pthread)
else()
target_link_libraries(MultiSense pthread rt)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
target_link_libraries(MultiSense rt)
endif()

if (BUILD_TESTS)
Expand Down
1 change: 1 addition & 0 deletions source/LibMultiSense/MultiSenseConfig.cmake.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ find_dependency(MultiSenseWire)
if (@BUILD_JSON_SERIALIZATION@)
find_dependency(nlohmann_json 3.9 REQUIRED)
endif ()
find_dependency(Threads)

include("${CMAKE_CURRENT_LIST_DIR}/MultiSenseTargets.cmake")

Expand Down
33 changes: 9 additions & 24 deletions source/Utilities/Legacy/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,17 @@ include_directories(shared)
# Common libraries that each utility needs to link with.
#

if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
MultiSense
ws2_32
)

elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
MultiSense
pthread
)

else ()

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
MultiSense
pthread
rt
find_package(Threads REQUIRED)
list(APPEND MULTISENSE_UTILITY_LIBS
MultiSense
Threads::Threads
)

endif ()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND MULTISENSE_UTILITY_LIBS ws2_32)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND MULTISENSE_UTILITY_LIBS rt)
endif()

#
# Recurse into each of these directories.
Expand Down
31 changes: 8 additions & 23 deletions source/Utilities/LibMultiSense/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@

if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
MultiSense
ws2_32
)

elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
MultiSense
pthread
)

else ()

set (MULTISENSE_UTILITY_LIBS
${MULTISENSE_UTILITY_LIBS}
find_package(Threads REQUIRED)
list(APPEND MULTISENSE_UTILITY_LIBS
MultiSense
pthread
rt
Threads::Threads
)

endif ()
if(CMAKE_SYSTEM_NAME STREQUAL "Windows" OR CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND MULTISENSE_UTILITY_LIBS ws2_32)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND MULTISENSE_UTILITY_LIBS rt)
endif()

add_subdirectory(ChangeIpUtility)
add_subdirectory(DeviceInfoUtility)
Expand Down