BUILD: Delete our own FindIconv.cmake

xoreos · Oct 6, 2023 · aae89c4 · aae89c4
1 parent d765d99
commit aae89c4
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 82 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -267,8 +267,8 @@ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(PHAETHON_LIBRARIES "")
 
 find_package(Iconv REQUIRED)
-include_directories(${ICONV_INCLUDE_DIRS})
-list(APPEND PHAETHON_LIBRARIES ${ICONV_LIBRARIES})
+include_directories(${Iconv_INCLUDE_DIRS})
+list(APPEND PHAETHON_LIBRARIES ${Iconv_LIBRARIES})
 
 find_package(ZLIB REQUIRED)
 include_directories(${ZLIB_INCLUDE_DIRS})

diff --git a/cmake/FindIconv.cmake b/cmake/FindIconv.cmake
diff --git a/rules.mk b/rules.mk
@@ -36,7 +36,6 @@ EXTRA_DIST += \
     cmake/CMakeAM.cmake \
     cmake/CMakeUninstall.cmake \
     cmake/FindFaad.cmake \
-    cmake/FindIconv.cmake \
     cmake/FindLibLZMA.cmake \
     cmake/FindMad.cmake \
     cmake/FindOgg.cmake \