diff options
| author | warptangent <warptangent@inbox.com> | 2015-07-16 05:18:15 -0700 |
|---|---|---|
| committer | warptangent <warptangent@inbox.com> | 2015-07-16 05:30:46 -0700 |
| commit | bbb936df0fd75bea41a00113a8ac4c4a281e970f (patch) | |
| tree | 292e15a137809efd662f371648a2f8539dd9a93b | |
| parent | Merge pull request #340 (diff) | |
| download | monero-bbb936df0fd75bea41a00113a8ac4c4a281e970f.tar.xz | |
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.
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ccb4133e..3e7378a7e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) |