mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 03:57:50 +08:00
35d0bcc29c
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [x] The "supports" clause reflects platforms that may be fixed by this new version. - [x] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. When you install curl[tool,idn2] with vcpkg, and the you do: ``` curl --version ``` You can see the lib that it install with, and even you install the feature idn2, it missing. I fix it. It should look similar to that: ``` curl 8.7.0-DEV (Linux) libcurl/8.7.0-DEV ... libidn2/2.3.4 ... ```
20 lines
571 B
Diff
20 lines
571 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a54c2ff..3b83a7f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -852,11 +852,9 @@ endif()
|
|
# Check for idn2
|
|
option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
|
|
if(USE_LIBIDN2)
|
|
- check_library_exists("idn2" "idn2_lookup_ul" "" HAVE_LIBIDN2)
|
|
- if(HAVE_LIBIDN2)
|
|
- set(CURL_LIBS "idn2;${CURL_LIBS}")
|
|
- check_include_file_concat("idn2.h" HAVE_IDN2_H)
|
|
- endif()
|
|
+ set(HAVE_LIBIDN2 TRUE)
|
|
+ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES})
|
|
+ set(HAVE_IDN2_H TRUE)
|
|
else()
|
|
set(HAVE_LIBIDN2 OFF)
|
|
endif()
|