Skip to content
Snippets Groups Projects
Commit c49795f2 authored by Ramin Yaghoubzadeh Torky's avatar Ramin Yaghoubzadeh Torky
Browse files

Third time's the charm

parent eea86dcc
No related branches found
No related tags found
No related merge requests found
...@@ -122,18 +122,16 @@ endif(WIN32) ...@@ -122,18 +122,16 @@ endif(WIN32)
set(LIBS ${LIBS} ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${RSBLIBS}) set(LIBS ${LIBS} ${PROTOBUF_LIBRARY} ${Boost_LIBRARIES} ${RSBLIBS})
if(!WIN32) if(NOT DEFINED WIN32)
message(STATUS "Adding extra options for building on POSIX")
set(LIBS ${LIBS} pthread)
if (DEFINED APPLE) if (DEFINED APPLE)
message(STATUS " - no flag needed on Mac") message(STATUS "No extra pthread flags needed on Mac")
# no special care required for our Apple clang thing
else() else()
message(STATUS " - extra flag for Linux") message(STATUS "Adding extra pthread flags for Linux")
# needs -lpthread AND -pthread # needs -lpthread AND -pthread
set(LIBS ${LIBS} pthread)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
endif() endif()
endif(!WIN32) endif(NOT DEFINED WIN32)
# Hide the rsb-induced boost-signals warning (FOR NOW) # Hide the rsb-induced boost-signals warning (FOR NOW)
set(IPAACA_CXX_DEFINES "${IPAACA_CXX_DEFINES} -DBOOST_SIGNALS_NO_DEPRECATION_WARNING") set(IPAACA_CXX_DEFINES "${IPAACA_CXX_DEFINES} -DBOOST_SIGNALS_NO_DEPRECATION_WARNING")
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment