Merge pull request #6682 from libgit2/ethomson/find_iconv

cmake: rename FindIconv to avoid collision with cmake

Merge pull request #6682 from libgit2/ethomson/find_iconv
cmake: rename FindIconv to avoid collision with cmake
955b2971 · Edward Thomson · GitHub · b4e84a76 · 9d767b9d · 955b2971
Unverified Commit 955b2971 authored Dec 16, 2023 by Edward Thomson Committed by GitHub Dec 16, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

cmake/FindIntlIconv.cmake
+0 -0

src/CMakeLists.txt
+1 -1

No files found.
--- a/cmake/FindIconv.cmake
+++ b/cmake/FindIconv.cmake
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -184,7 +184,7 @@ add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")

 # iconv
 if(USE_ICONV)
-	find_package(Iconv)
+	find_package(IntlIconv)
 endif()
 if(ICONV_FOUND)
 	set(GIT_USE_ICONV 1)