From 473e23f992cd2557c1fd7d5e4dbfc08d9bb1f1a8 Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Mon, 18 Apr 2016 21:23:03 +0200 Subject: [PATCH] cmake: add imported target for Libtorrent --- cmake/Modules/FindLibtorrentRasterbar.cmake | 12 ++++++++++++ src/CMakeLists.txt | 2 -- src/base/CMakeLists.txt | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/cmake/Modules/FindLibtorrentRasterbar.cmake b/cmake/Modules/FindLibtorrentRasterbar.cmake index f1ece1be4..1f09f2d95 100644 --- a/cmake/Modules/FindLibtorrentRasterbar.cmake +++ b/cmake/Modules/FindLibtorrentRasterbar.cmake @@ -91,3 +91,15 @@ find_package_handle_standard_args(LibtorrentRasterbar DEFAULT_MSG mark_as_advanced(LibtorrentRasterbar_INCLUDE_DIR LibtorrentRasterbar_LIBRARY LibtorrentRasterbar_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES LibtorrentRasterbar_ENCRYPTION_INDEX) + +if (LibtorrentRasterbar_FOUND AND NOT TARGET LibtorrentRasterbar::LibTorrent) + add_library(LibtorrentRasterbar::LibTorrent UNKNOWN IMPORTED) + + set_target_properties(LibtorrentRasterbar::LibTorrent PROPERTIES + IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" + IMPORTED_LOCATION "${LibtorrentRasterbar_LIBRARY}" + INTERFACE_INCLUDE_DIRECTORIES "${LibtorrentRasterbar_INCLUDE_DIRS}" + INTERFACE_LINK_LIBRARIES "${LibtorrentRasterbar_LIBRARIES}" + INTERFACE_COMPILE_OPTIONS "${LibtorrentRasterbar_DEFINITIONS}" + ) +endif() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 196871230..bafdbb717 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,8 +6,6 @@ include(MacroLinkQtComponents) include(QbtTargetSources) find_package(LibtorrentRasterbar REQUIRED) -include_directories(SYSTEM ${LibtorrentRasterbar_INCLUDE_DIRS}) -add_compile_options(${LibtorrentRasterbar_DEFINITIONS}) # Boost set(Boost_USE_MULTITHREADED ON) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index ecf7c2533..2cde01244 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -113,7 +113,7 @@ tristatebool.cpp ) add_library(qbt_base STATIC ${QBT_BASE_HEADERS} ${QBT_BASE_SOURCES}) -target_link_libraries(qbt_base ${ZLIB_LIBRARIES} ${LibtorrentRasterbar_LIBRARIES}) +target_link_libraries(qbt_base ${ZLIB_LIBRARIES} LibtorrentRasterbar::LibTorrent) target_link_qt_components(qbt_base Core Network Xml) if (QT4_FOUND) if (GUI)