diff options
author | Oleg Morozenkov <m@oleg.rocks> | 2019-12-05 01:06:02 +0300 |
---|---|---|
committer | Oleg Morozenkov <m@oleg.rocks> | 2019-12-05 01:06:02 +0300 |
commit | 2b5baa24597778d8e9f5d93c30a6f6440ef90971 (patch) | |
tree | 589202ffbaecb0ff2176575688e30cf18b317a61 /CMakeLists.txt | |
parent | e1031f20f9139a554c3e4cf70585ae0dcea1bcda (diff) | |
parent | 76f36598570a13862471175cbfdbfb9dec4139d2 (diff) |
Merge branch 'master' into nitanmarcel/api_update_pr
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 908cf69..8f8bbcf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,6 @@ cmake_minimum_required(VERSION 2.8.4) project(TgBot) -if (${CONAN_EXPORTED}) - include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake) - conan_basic_setup() -endif() - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) # options @@ -47,7 +42,7 @@ find_package(OpenSSL REQUIRED) include_directories(${OPENSSL_INCLUDE_DIR}) ## curl -find_package(CURL) +find_package(CURL 7.56.0) if (CURL_FOUND) include_directories(${CURL_INCLUDE_DIRS}) add_definitions(-DHAVE_CURL) |