d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6289 from evsh/cmake

Browse Source 
Cmake compilation fixes
This commit is contained in:
sledgehammer999 2017-01-25 23:06:21 +02:00 committed by GitHub
commit 14ebf2118a
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/Modules/FindLibtorrentRasterbar.cmake
View File

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

9
cmake/Modules/winconf.cmake
View File

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

1
src/gui/rss/CMakeLists.txt
View File

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