Skip to content
This repository has been archived by the owner on Mar 29, 2021. It is now read-only.

Commit

Permalink
Merge pull request #7 from isaachier/hunter-0.9.2
Browse files Browse the repository at this point in the history
Hunter 0.9.2
  • Loading branch information
ruslo committed Nov 16, 2017
2 parents 3a2f88b + 61d2a5a commit 7757418
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions lib/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ set(SYSLIBS "")
set(package_deps Boost)
set(boost_components)

list(APPEND SYSLIBS Boost::boost)

# Create the thrift C++ library
set( thriftcpp_SOURCES
src/thrift/Thrift.cpp
Expand All @@ -47,10 +49,8 @@ set( thriftcpp_SOURCES
src/thrift/transport/TSocket.cpp
src/thrift/transport/TPipe.cpp
src/thrift/transport/TPipeServer.cpp
src/thrift/transport/TSSLSocket.cpp
src/thrift/transport/TSocketPool.cpp
src/thrift/transport/TServerSocket.cpp
src/thrift/transport/TSSLServerSocket.cpp
src/thrift/transport/TTransportUtils.cpp
src/thrift/transport/TBufferTransports.cpp
src/thrift/server/TServer.cpp
Expand Down Expand Up @@ -112,7 +112,6 @@ if(WITH_BOOSTTHREADS)
src/thrift/concurrency/BoostMonitor.cpp
src/thrift/concurrency/BoostMutex.cpp
)
list(APPEND SYSLIBS "${Boost_LIBRARIES}")
list(APPEND boost_components thread)
elseif(UNIX AND NOT WITH_STDTHREADS)
if(ANDROID)
Expand Down Expand Up @@ -164,9 +163,9 @@ include(ThriftMacros)

ADD_LIBRARY_THRIFT(thrift ${thriftcpp_SOURCES} ${thriftcpp_threads_SOURCES})
if(WIN32)
TARGET_LINK_LIBRARIES_THRIFT(thrift ${SYSLIBS} ws2_32)
TARGET_LINK_LIBRARIES_THRIFT(thrift PUBLIC ${SYSLIBS} ws2_32)
else()
TARGET_LINK_LIBRARIES_THRIFT(thrift ${SYSLIBS})
TARGET_LINK_LIBRARIES_THRIFT(thrift PUBLIC ${SYSLIBS})
endif()

if(WITH_LIBEVENT)
Expand Down

0 comments on commit 7757418

Please sign in to comment.