Browse Source

cmake: fix boost components manipulations in FindLibtorrentRasterbar.cmake

The list of components which we pass to find_package() has to be semicolon
separated (i.e. to be the usual cmake list)
adaptive-webui-19844
Eugene Shalygin 8 years ago
parent
commit
eff13cc9eb
  1. 11
      cmake/Modules/FindLibtorrentRasterbar.cmake

11
cmake/Modules/FindLibtorrentRasterbar.cmake

@ -69,13 +69,13 @@ set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR}) @@ -69,13 +69,13 @@ set(LibtorrentRasterbar_INCLUDE_DIRS ${LibtorrentRasterbar_INCLUDE_DIR})
# Without pkg-config, we can't possibly figure out the correct boost dependencies
if (LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
string(REPLACE ";" " " _boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
set(_boost_components "${LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES}")
else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
if(PC_LIBTORRENT_RASTERBAR_FOUND)
_detect_boost_components(_boost_cmpnts "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
_detect_boost_components(_boost_components "${PC_LIBTORRENT_RASTERBAR_LIBRARIES}")
else()
# all possible boost dependencies
set(_boost_cmpnts
set(_boost_components
date_time
system
chrono
@ -83,11 +83,10 @@ else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES) @@ -83,11 +83,10 @@ else(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
thread
)
endif()
list(SORT _boost_cmpnts)
message(STATUS "Libtorrent Boost dependencies: ${_boost_cmpnts}")
string(REPLACE ";" " " _boost_components "${_boost_cmpnts}")
endif(LibtorrentRasterbar_CUSTOM_BOOST_DEPENDENCIES)
list(SORT _boost_components)
message(STATUS "Libtorrent Boost dependencies: ${_boost_components}")
find_package(Boost REQUIRED COMPONENTS ${_boost_components})
set(LibtorrentRasterbar_LIBRARIES ${LibtorrentRasterbar_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
foreach(_boost_cmpnt IN LISTS _boost_components)

Loading…
Cancel
Save