From f69b5ade2d2a96bbccc291a9ccf6a81672fd7068 Mon Sep 17 00:00:00 2001 From: BlackMATov Date: Fri, 6 Aug 2021 09:14:32 +0700 Subject: [PATCH] update curl to 7.78.0 --- CMakeLists.txt | 12 +++++++++--- untests/CMakeLists.txt | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c37c718..34a696a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -# 3.8 version is required for `cxx_std_17` -cmake_minimum_required(VERSION 3.8 FATAL_ERROR) +# 3.11 version is required for `FetchContent` +cmake_minimum_required(VERSION 3.11 FATAL_ERROR) if(NOT DEFINED PROJECT_NAME) set(BUILD_AS_STANDALONE ON) @@ -76,6 +76,12 @@ target_include_directories(${PROJECT_NAME} target_compile_features(${PROJECT_NAME} PUBLIC cxx_std_17) +target_compile_definitions(${PROJECT_NAME} + PRIVATE + $<$: + NOMINMAX + WIN32_LEAN_AND_MEAN>) + target_compile_options(${PROJECT_NAME} PRIVATE $<$,$>: @@ -123,7 +129,7 @@ if(USE_EMBEDDED_CURL) FetchContent_Declare( embedded_curl GIT_REPOSITORY https://github.com/curl/curl - GIT_TAG curl-7_74_0) + GIT_TAG curl-7_78_0) FetchContent_GetProperties(embedded_curl) if(NOT embedded_curl_POPULATED) diff --git a/untests/CMakeLists.txt b/untests/CMakeLists.txt index 2240052..ca043fb 100644 --- a/untests/CMakeLists.txt +++ b/untests/CMakeLists.txt @@ -1,6 +1,3 @@ -# 3.11 version is required for `FetchContent` -cmake_minimum_required(VERSION 3.11 FATAL_ERROR) - project(curly.hpp.untests) #