Use g++ flag "-pthread" instead of "-lpthread", where preferred

CMake supports this through THREADS_PREFER_PTHREAD_FLAG.

Remove inclusion of pthread library in EXTRA_LIBRARIES, as the
individual CMakeLists.txt files which need pthread already require it
with CMAKE_THREAD_LIBS_INIT.
This commit is contained in:
warptangent 2015-07-16 05:18:15 -07:00
parent c9e5fece32
commit bbb936df0f
No known key found for this signature in database
GPG Key ID: 0E490BEBFBE4E92D
1 changed files with 2 additions and 1 deletions

View File

@ -230,6 +230,7 @@ add_definitions("-DBLOCKCHAIN_DB=${BLOCKCHAIN_DB}")
if (UNIX AND NOT APPLE)
# Note that at the time of this writing the -Wstrict-prototypes flag added below will make this fail
set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads)
endif()
@ -410,7 +411,7 @@ elseif(APPLE OR FREEBSD)
set(EXTRA_LIBRARIES "")
elseif(NOT MSVC)
find_library(RT rt)
set(EXTRA_LIBRARIES ${RT} ${PTHREAD} ${DL})
set(EXTRA_LIBRARIES ${RT} ${DL})
endif()
include(version.cmake)