From 3f53f17411f3a2646bdc40f7e0809d7cec5e6735 Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Mon, 18 Apr 2016 22:40:22 +0200 Subject: [PATCH] cmake: raise minimal cmake version to 3.5 and use its features --- CMakeLists.txt | 4 ++-- src/base/CMakeLists.txt | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eff858410..a049e0677 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -cmake_minimum_required(VERSION 3.2) -cmake_policy(VERSION 3.2) +cmake_minimum_required(VERSION 3.5) +cmake_policy(VERSION 3.5) project(qBittorrent VERSION 3.4.0.0) diff --git a/src/base/CMakeLists.txt b/src/base/CMakeLists.txt index 2cde01244..e3cc374a8 100644 --- a/src/base/CMakeLists.txt +++ b/src/base/CMakeLists.txt @@ -1,5 +1,4 @@ find_package(ZLIB REQUIRED) -include_directories(SYSTEM ${ZLIB_INCLUDE_DIRS}) set(QBT_BASE_HEADERS bittorrent/cachestatus.h @@ -113,7 +112,7 @@ tristatebool.cpp ) add_library(qbt_base STATIC ${QBT_BASE_HEADERS} ${QBT_BASE_SOURCES}) -target_link_libraries(qbt_base ${ZLIB_LIBRARIES} LibtorrentRasterbar::LibTorrent) +target_link_libraries(qbt_base ZLIB::ZLIB LibtorrentRasterbar::LibTorrent) target_link_qt_components(qbt_base Core Network Xml) if (QT4_FOUND) if (GUI)