Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 21:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Drop hard requirement on explicit -lpthread support

Browse source 
Closes #5512
This commit is contained in:
Mahmoud Al-Qudsi 2019-01-10 19:43:35 -06:00
parent f5893ba475
commit b402b635a9
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/ConfigureChecks.cmake
View file

@ -28,7 +28,12 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
IF(CMAKE_VERSION VERSION_LESS 3.4.0) IF(CMAKE_VERSION VERSION_LESS 3.4.0)
ENABLE_LANGUAGE(C) ENABLE_LANGUAGE(C)
ENDIF() ENDIF()
FIND_PACKAGE(Threads REQUIRED) # Don't set pthreads to required. Either we're on a platform where explict
# linking with -lpthread is the norm (e.g. Linux) and it'll be found, or we're
# on a platform that include pthreads by default (e.g. BSD, macOS) where this
# won't find anything, or we're on a road-much-less-traveled OS where the user
# can figure out what's wrong without a hard error here. See #5512.
FIND_PACKAGE(Threads)
# Detect WSL. Does not match against native Windows/WIN32. # Detect WSL. Does not match against native Windows/WIN32.
if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft") if (CMAKE_HOST_SYSTEM_VERSION MATCHES ".*-Microsoft")