Merge pull request #341

bbb936d Use g++ flag "-pthread" instead of "-lpthread", where preferred (warptangent)
This commit is contained in:
Riccardo Spagni 2015-07-16 14:32:18 +02:00
commit a092fcd607
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
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)