drop iconv dependency

Karry · Jan 4, 2024 · f0e47c9 · f0e47c9
1 parent 4af6d63
commit f0e47c9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 109 deletions.
diff --git a/CMakeMod/Config.h.cmake b/CMakeMod/Config.h.cmake
@@ -341,14 +341,6 @@
 #cmakedefine HAVE_LIB_ZLIB 1
 #endif
 
-/* iconv detected */
-#ifndef HAVE_ICONV
-#cmakedefine HAVE_ICONV 1
-#endif
-#ifndef ICONV_CONST
-#define ICONV_CONST @ICONV_CONST@
-#endif
-
 /* libagg detected */
 #ifndef HAVE_LIB_AGG
 #cmakedefine HAVE_LIB_AGG 1

diff --git a/CMakeMod/FindICONV.cmake b/CMakeMod/FindICONV.cmake
diff --git a/CMakeMod/features.cmake b/CMakeMod/features.cmake
@@ -110,30 +110,6 @@ if(NOT TARGET LibXml2::LibXml2)
   )
 endif()
 
-find_package(Iconv QUIET)
-if(TARGET Iconv::Iconv)
-  set(HAVE_ICONV TRUE)
-
-  cmake_push_check_state(RESET)
-  set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR})
-  set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
-  if(MSVC)
-    set(CMAKE_REQUIRED_FLAGS /we4028 /fp:fast /wd4251 /Oi)
-  endif()
-  check_prototype_definition("iconv"
-          "size_t iconv(iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft)"
-          "-1"
-          "iconv.h"
-          ICONV_SECOND_ARGUMENT_IS_CONST)
-  cmake_pop_check_state()
-
-  if(${ICONV_SECOND_ARGUMENT_IS_CONST})
-    set(ICONV_CONST "const")
-  endif()
-else()
-  message(WARNING "No iconv support")
-endif()
-
 # prepare cmake variables for configuration files
 set(OSMSCOUT_HAVE_INT16_T ${HAVE_INT16_T})
 set(OSMSCOUT_HAVE_INT32_T ${HAVE_INT32_T})