-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
9 changed files
with
110 additions
and
138 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 3a2128e..e9c9c92 100644 | ||
| index 7242d68..da69699 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1662,7 +1662,9 @@ if(NOT CURL_DISABLE_INSTALL) | ||
| @@ -1918,7 +1918,9 @@ if(NOT CURL_DISABLE_INSTALL) | ||
| endif() | ||
| endforeach() | ||
|
|
||
| - foreach(_lib ${CMAKE_C_IMPLICIT_LINK_LIBRARIES} ${CURL_LIBS}) | ||
| - foreach(_lib IN LISTS CMAKE_C_IMPLICIT_LINK_LIBRARIES CURL_LIBS) | ||
| + set(CURL_LIBS_FLAT "") | ||
| + vcpkg_curl_flatten(CURL_LIBS CURL_LIBS_FLAT) | ||
| + foreach(_lib ${CURL_LIBS_FLAT}) | ||
| + foreach(_lib IN LISTS CURL_LIBS_FLAT) | ||
| if(TARGET "${_lib}") | ||
| set(_libname "${_lib}") | ||
| get_target_property(_imported "${_libname}" IMPORTED) |
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 |
|---|---|---|
| @@ -1,15 +1,15 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index bb6ccf1..a0df85f 100644 | ||
| index da69699..3a9b844 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1913,8 +1913,10 @@ if(NOT CURL_DISABLE_INSTALL) | ||
| set(CPPFLAG_CURL_STATICLIB "") | ||
| @@ -2042,8 +2042,10 @@ if(NOT CURL_DISABLE_INSTALL) | ||
| set(LIBCURL_PC_CFLAGS "") | ||
| else() | ||
| set(ENABLE_SHARED "no") | ||
| + set(LIBCURL_PC_REQUIRES_PRIVATE "") # flattened into LIBCURL_LIBS | ||
| set(LIBCURL_PC_REQUIRES "${LIBCURL_PC_REQUIRES_PRIVATE}") | ||
| set(LIBCURL_NO_SHARED "${LIBCURL_LIBS}") | ||
| + set(LIBCURL_LIBS "") | ||
| set(CPPFLAG_CURL_STATICLIB "-DCURL_STATICLIB") | ||
| set(ENABLE_SHARED "no") | ||
| + set(LIBCURL_PC_REQUIRES_PRIVATE "") # flattened into LIBCURL_PC_LIBS | ||
| set(LIBCURL_PC_REQUIRES "${LIBCURL_PC_REQUIRES_PRIVATE}") | ||
| set(LIBCURL_PC_LIBS "${LIBCURL_PC_LIBS_PRIVATE}") | ||
| + set(LIBCURL_PC_LIBS_PRIVATE "") # in LIBCURL_PC_LIBS | ||
| set(LIBCURL_PC_CFLAGS "${LIBCURL_PC_CFLAGS_PRIVATE}") | ||
| endif() | ||
| if(BUILD_STATIC_LIBS) |
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
This file was deleted.
Oops, something went wrong.
10 changes: 5 additions & 5 deletions
10
vcpkg/overlay_ports/curl/nscurl/curl_ftruncate_CMakeLists.patch
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 |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1395,3 +1395,3 @@ | ||
| check_symbol_exists(eventfd "${CURL_INCLUDES};sys/eventfd.h" HAVE_EVENTFD) | ||
| -check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) | ||
| +# check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) # nscurl: The mingw-x64 implementation of ftruncate() calls FindFirstVolume/FindNextVolume/GetFileSizeEx, unavailable in NT4 | ||
| check_symbol_exists(_fseeki64 "${CURL_INCLUDES};stdio.h" HAVE__FSEEKI64) | ||
| @@ -1534,3 +1534,3 @@ | ||
| check_symbol_exists("eventfd" "${CURL_INCLUDES};sys/eventfd.h" HAVE_EVENTFD) | ||
| -check_symbol_exists("ftruncate" "${CURL_INCLUDES}" HAVE_FTRUNCATE) | ||
| +#check_symbol_exists(ftruncate "${CURL_INCLUDES}" HAVE_FTRUNCATE) # nscurl: The mingw-x64 implementation of ftruncate() calls FindFirstVolume/FindNextVolume/GetFileSizeEx, unavailable in NT4 | ||
| check_symbol_exists("_fseeki64" "${CURL_INCLUDES};stdio.h" HAVE__FSEEKI64) |
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 |
|---|---|---|
| @@ -1,19 +1,8 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a54c2fff9..06477f794 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -1089,10 +1089,10 @@ if(WIN32) | ||
| unset(HAVE_WIN32_WINNT CACHE) | ||
|
|
||
| if(HAVE_WIN32_WINNT) | ||
| - if(HAVE_WIN32_WINNT STRLESS "0x0501") | ||
| - # Windows XP is required for freeaddrinfo, getaddrinfo | ||
| @@ -1399,3 +1399,3 @@ | ||
| # Windows XP is required for freeaddrinfo, getaddrinfo | ||
| - message(FATAL_ERROR "Building for Windows XP or newer is required.") | ||
| - endif() | ||
| + # if(HAVE_WIN32_WINNT STRLESS "0x0501") | ||
| + # # Windows XP is required for freeaddrinfo, getaddrinfo | ||
| + # message(FATAL_ERROR "Building for Windows XP or newer is required.") | ||
| + # endif() | ||
|
|
||
| # pre-fill detection results based on target OS version | ||
| if(MINGW OR MSVC) | ||
| + # message(FATAL_ERROR "Building for Windows XP or newer is required.") # nscurl: This statement is incorrect. We can use *addrinfo on platforms older than XP | ||
| endif() |
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