mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 05:41:37 +08:00
9911cb74a1
<!-- 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. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) -->
22 lines
655 B
Diff
22 lines
655 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a54c2ff..3b83a7f 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -852,11 +852,11 @@ 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()
|
|
+ find_package(PkgConfig REQUIRED)
|
|
+ pkg_check_modules(LIBIDN2 REQUIRED libidn2)
|
|
+ set(HAVE_LIBIDN2 TRUE)
|
|
+ list(INSERT CURL_LIBS 0 ${LIBIDN2_LINK_LIBRARIES})
|
|
+ set(HAVE_IDN2_H TRUE)
|
|
else()
|
|
set(HAVE_LIBIDN2 OFF)
|
|
endif()
|