Merge pull request #6289 from evsh/cmake

Cmake compilation fixes

cmake/Modules/FindLibtorrentRasterbar.cmake

@@ -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)
             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)

cmake/Modules/winconf.cmake

@@ -9,7 +9,10 @@ set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
     -DBOOST_EXCEPTION_DISABLE
     -DBOOST_SYSTEM_STATIC_LINK=1
     -DTORRENT_USE_OPENSSL
-    -DUNICODE
+    -D__USE_W32_SOCKETS
+    -D_FILE_OFFSET_BITS=64)
+
+add_definitions(-DUNICODE
     -D_UNICODE
     -DWIN32
     -D_WIN32
@@ -18,9 +21,7 @@ set(LibtorrentRasterbar_CUSTOM_DEFINITIONS
     -D_WIN32_IE=0x0500
     -D_CRT_SECURE_NO_DEPRECATE
     -D_SCL_SECURE_NO_DEPRECATE
-    -D__USE_W32_SOCKETS
-    -D_FILE_OFFSET_BITS=64)
-
+)
 # and boost
 set(Boost_USE_STATIC_LIBS  True)
 # set(Boost_USE_STATIC_RUNTIME True)

src/gui/rss/CMakeLists.txt

@@ -23,6 +23,7 @@ rsssettingsdlg.ui
 )
 
 add_library(qbt_rss STATIC ${QBT_RSS_HEADERS} ${QBT_RSS_SOURCE} ${QBT_RSS_FORMS})
+target_link_libraries(qbt_rss qbt_base)
 if (QT4_FOUND)
     target_link_libraries(qbt_rss Qt4::QtGui Qt4::QtNetwork)
 else (QT4_FOUND)