From 9d767b9d5ea05821c0213ec49a593f31241f5ef3 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Thu, 14 Dec 2023 22:26:05 +0000 Subject: [PATCH] cmake: rename FindIconv to avoid collision with cmake cmake now includes `FindIconv`. Rename ours to avoid any confusion. --- cmake/{FindIconv.cmake => FindIntlIconv.cmake} | 0 src/CMakeLists.txt | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename cmake/{FindIconv.cmake => FindIntlIconv.cmake} (100%) diff --git a/cmake/FindIconv.cmake b/cmake/FindIntlIconv.cmake similarity index 100% rename from cmake/FindIconv.cmake rename to cmake/FindIntlIconv.cmake diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b412452c9..ed3f4a514 100644 --- 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)