-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
curl-cmake.sh: apply upstream PR and adapt build config [ci skip]
Sync up OS target selection settings with autotools and m32. Ref: curl/curl#9046
- Loading branch information
Showing
3 changed files
with
27 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 45d763d5a9c1d..4df2393063dd1 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -78,20 +78,11 @@ option(BUILD_SHARED_LIBS "Build shared libraries" ON) | ||
option(ENABLE_ARES "Set to ON to enable c-ares support" OFF) | ||
if(WIN32) | ||
option(CURL_STATIC_CRT "Set to ON to build libcurl with static CRT on Windows (/MT)." OFF) | ||
- option(ENABLE_INET_PTON "Set to OFF to prevent usage of inet_pton when building against modern SDKs while still requiring compatibility with older Windows versions, such as Windows XP, Windows Server 2003 etc." ON) | ||
option(ENABLE_UNICODE "Set to ON to use the Unicode version of the Windows API functions" OFF) | ||
set(CURL_TARGET_WINDOWS_VERSION "" CACHE STRING "Minimum target Windows version as hex string") | ||
if(CURL_TARGET_WINDOWS_VERSION) | ||
add_definitions(-D_WIN32_WINNT=${CURL_TARGET_WINDOWS_VERSION}) | ||
set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=${CURL_TARGET_WINDOWS_VERSION}") | ||
- elseif(ENABLE_INET_PTON) | ||
- # _WIN32_WINNT_VISTA (0x0600) | ||
- add_definitions(-D_WIN32_WINNT=0x0600) | ||
- set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0600") | ||
- else() | ||
- # _WIN32_WINNT_WINXP (0x0501) | ||
- add_definitions(-D_WIN32_WINNT=0x0501) | ||
- set(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0501") | ||
endif() | ||
if(ENABLE_UNICODE) | ||
add_definitions(-DUNICODE -D_UNICODE) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
curl.patch |