From 0beb5185e6d624ef68466d860a8230f346eec477 Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Thu, 28 Dec 2023 11:57:40 +0100 Subject: [PATCH 1/2] Defining NOMINMAX for windows to prevent std::{min,max} issues --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5af365768..7fe4635f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,6 +280,12 @@ else() restore_variable(DESTINATION CMAKE_CXX_CLANG_TIDY BACKUP CMAKE_CXX_CLANG_TIDY_BKP) endif() +# Add the NOMINMAX macro for windows to curl to prevent issues with std::min and std::max down the line. +# Ref: https://github.com/libcpr/cpr/issues/957 +if(WIN32) + target_compile_definitions(CURL::libcurl PUBLIC NOMINMAX) +endif() + # GTest configuration if(CPR_BUILD_TESTS) if(CPR_USE_SYSTEM_GTEST) From 4d99fcad0ffd2c20c5f1b26b8b4a4280f413e31b Mon Sep 17 00:00:00 2001 From: Fabian Sauter Date: Sat, 20 Jan 2024 19:21:08 +0100 Subject: [PATCH 2/2] Defining NOMINMAX for all in cpr --- CMakeLists.txt | 6 ------ cpr/CMakeLists.txt | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7fe4635f6..5af365768 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -280,12 +280,6 @@ else() restore_variable(DESTINATION CMAKE_CXX_CLANG_TIDY BACKUP CMAKE_CXX_CLANG_TIDY_BKP) endif() -# Add the NOMINMAX macro for windows to curl to prevent issues with std::min and std::max down the line. -# Ref: https://github.com/libcpr/cpr/issues/957 -if(WIN32) - target_compile_definitions(CURL::libcurl PUBLIC NOMINMAX) -endif() - # GTest configuration if(CPR_BUILD_TESTS) if(CPR_USE_SYSTEM_GTEST) diff --git a/cpr/CMakeLists.txt b/cpr/CMakeLists.txt index 52787f56a..788ad9535 100644 --- a/cpr/CMakeLists.txt +++ b/cpr/CMakeLists.txt @@ -32,6 +32,12 @@ add_library(cpr add_library(cpr::cpr ALIAS cpr) +# Add the NOMINMAX macro for windows to curl to prevent issues with std::min and std::max down the line. +# Ref: https://github.com/libcpr/cpr/issues/957 +if(WIN32) + target_compile_definitions(cpr PUBLIC NOMINMAX) +endif() + target_link_libraries(cpr PUBLIC CURL::libcurl) # todo should be private, but first dependencies in ssl_options need to be removed # Fix missing OpenSSL includes for Windows since in 'ssl_ctx.cpp' we include OpenSSL directly