Unverified Commit 955b2971 by Edward Thomson Committed by GitHub

Merge pull request #6682 from libgit2/ethomson/find_iconv

cmake: rename FindIconv to avoid collision with cmake
parents b4e84a76 9d767b9d
...@@ -184,7 +184,7 @@ add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix") ...@@ -184,7 +184,7 @@ add_feature_info(ntlmclient GIT_NTLM "NTLM authentication support for Unix")
# iconv # iconv
if(USE_ICONV) if(USE_ICONV)
find_package(Iconv) find_package(IntlIconv)
endif() endif()
if(ICONV_FOUND) if(ICONV_FOUND)
set(GIT_USE_ICONV 1) set(GIT_USE_ICONV 1)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment