mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-12-16 11:25:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

use CMake's built in pthread detection

Browse Source 
CMake ships with a standard FindThreads module which can be used to a)
test for a threading library and b) confirm that it is pthread. It also
allows the hard-coding of the threading library name to be removed from
``src/CMakeLists.txt``.

Make it an error not to have a pthread library installed and indicate to
CMake that we strongly prefer pthread to any other platform threading
library.
This commit is contained in:
Rich Wareham
2014-02-24 18:52:12 +00:00
parent 68847d7825
commit fd346a95fa
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@@ -15,6 +15,15 @@ else()
set(DEBUG 0) set(DEBUG 0)
endif() endif()
# Determine platform's threading library. Set CMAKE_THREAD_PREFER_PTHREAD
# explicitly to indicate a strong preference for pthread. It is an error to not
# have pthread installed even if, for example, the Win32 threading API is found.
set(CMAKE_THREAD_PREFER_PTHREAD ON)
find_package(Threads REQUIRED)
if(NOT CMAKE_USE_PTHREADS_INIT)
message(SEND_ERROR "The pthread library must be installed on your system.")
endif(NOT CMAKE_USE_PTHREADS_INIT)
# add dependencies to include/lib directories # add dependencies to include/lib directories
link_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/lib") link_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/lib")
include_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/include") include_directories ("${PROJECT_SOURCE_DIR}/.deps/usr/include")

2
src/CMakeLists.txt
View File

@@ -14,7 +14,7 @@ file( GLOB IO_SOURCES io/*.c )
add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES}) add_executable (vim ${NEOVIM_SOURCES} ${IO_SOURCES})
target_link_libraries (vim m uv pthread) target_link_libraries (vim m uv ${CMAKE_THREAD_LIBS_INIT})
include(CheckLibraryExists) include(CheckLibraryExists)
check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP) check_library_exists(termcap tgetent "" HAVE_LIBTERMCAP)