From 439bf44fac42de5ba4d3ceae0a4db706a3f84175 Mon Sep 17 00:00:00 2001 From: Daniel Nachbaur Date: Fri, 2 Jun 2017 10:44:29 +0200 Subject: [PATCH] Static linking fixes * Skip linking boost unit_test library to not have multiple main * Do not link pthread if static fix multiple definition of `__pthread_atfork' --- lunchbox/CMakeLists.txt | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lunchbox/CMakeLists.txt b/lunchbox/CMakeLists.txt index e6050140..12740aef 100644 --- a/lunchbox/CMakeLists.txt +++ b/lunchbox/CMakeLists.txt @@ -104,9 +104,15 @@ set(LUNCHBOX_SOURCES set(LUNCHBOX_PUBLIC_INCLUDE_DIRECTORIES ${Boost_INCLUDE_DIRS}) -list(APPEND LUNCHBOX_LINK_LIBRARIES PUBLIC ${Boost_LIBRARIES} Servus - ${PTHREAD_LIBRARIES} PRIVATE) +list(APPEND LUNCHBOX_LINK_LIBRARIES PUBLIC + ${Boost_FILESYSTEM_LIBRARIES} ${Boost_REGEX_LIBRARIES} + ${Boost_SERIALIZATION_LIBRARIES} ${Boost_SYSTEM_LIBRARIES} Servus) +if(COMMON_LIBRARY_TYPE MATCHES "SHARED") + list(APPEND LUNCHBOX_LINK_LIBRARIES ${PTHREAD_LIBRARIES}) +endif() + +list(APPEND LUNCHBOX_LINK_LIBRARIES PRIVATE) if(WIN32) list(APPEND LUNCHBOX_LINK_LIBRARIES ws2_32 mswsock imagehlp) endif(WIN32)