Merge pull request #54 from mattkelly/pthread-fix
Fix pthread compile errors on Linux
This commit is contained in:
commit
02d5fc64be
1 changed files with 6 additions and 2 deletions
|
@ -48,5 +48,9 @@ INCLUDE_DIRECTORIES(${PROTOBUF_INCLUDE_DIR})
|
|||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
||||
add_library(cockatrice_common ${common_SOURCES} ${common_HEADERS_MOC})
|
||||
# Without this check, Linux will put -pthread out of order in link.txt and build will fail
|
||||
if (UNIX)
|
||||
target_link_libraries(cockatrice_common cockatrice_protocol pthread)
|
||||
else (UNIX)
|
||||
target_link_libraries(cockatrice_common cockatrice_protocol)
|
||||
|
||||
endif (UNIX)
|
||||
|
|
Loading…
Reference in a new issue