If swiften-config does not return multithreaded boost libraries, we have to use non-multithreaded boost too
This commit is contained in:
parent
745b8a54ba
commit
f55f18b579
1 changed files with 15 additions and 1 deletions
|
@ -15,6 +15,15 @@ message(STATUS "|- log4cxx : -DLOG4CXX_INCLUDE_DIR, -DLOG4CXX_LIBRARY")
|
|||
message(STATUS "|- purple : -DPURPLE_INCLUDE_DIR, -DPURPLE_LIBRARY")
|
||||
message(STATUS " : -DPURPLE_NOT_RUNTIME - enables compilation with libpurple.lib")
|
||||
|
||||
MACRO(LIST_CONTAINS var value)
|
||||
SET(${var})
|
||||
FOREACH (value2 ${ARGN})
|
||||
IF (${value} STREQUAL ${value2})
|
||||
SET(${var} TRUE)
|
||||
ENDIF (${value} STREQUAL ${value2})
|
||||
ENDFOREACH (value2)
|
||||
ENDMACRO(LIST_CONTAINS)
|
||||
|
||||
if(NOT LIB_INSTALL_DIR)
|
||||
set(LIB_INSTALL_DIR "lib")
|
||||
endif()
|
||||
|
@ -131,7 +140,12 @@ if (WIN32)
|
|||
set(Boost_USE_STATIC_RUNTIME OFF)
|
||||
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
|
||||
else(WIN32)
|
||||
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread signals REQUIRED)
|
||||
LIST_CONTAINS(contains -lboost_program_options ${SWIFTEN_LIBRARY})
|
||||
if(contains)
|
||||
message(STATUS "Using non-multithreaded boost")
|
||||
set(Boost_USE_MULTITHREADED 0)
|
||||
endif(contains)
|
||||
find_package(Boost COMPONENTS program_options date_time system filesystem regex thread-mt signals REQUIRED)
|
||||
endif(WIN32)
|
||||
|
||||
message( STATUS "Found Boost: ${Boost_LIBRARIES}, ${Boost_INCLUDE_DIR}")
|
||||
|
|
Loading…
Add table
Reference in a new issue