Skip to content

Commit

Permalink
Defining NOMINMAX for all in cpr
Browse files Browse the repository at this point in the history
  • Loading branch information
COM8 committed Jan 20, 2024
1 parent 0beb518 commit 4d99fca
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 0 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions cpr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4d99fca

Please sign in to comment.