Merge pull request #1551 from Karry/drop-iconv2

remvoe iconv from CMake and Github actions
Framstag · Jan 1, 2024 · ec3471a · ec3471a
2 parents bfc6e05 + 83ee88b
commit ec3471a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/.github/workflows/build_and test_on_msys.yml b/.github/workflows/build_and test_on_msys.yml
@@ -25,7 +25,7 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           update: true
-          install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-libiconv
+          install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool
                     mingw-w64-x86_64-cmake mingw-w64-x86_64-extra-cmake-modules mingw-w64-x86_64-ninja
                     mingw-w64-x86_64-protobuf
                     mingw-w64-x86_64-libxml2
@@ -55,7 +55,7 @@ jobs:
         uses: msys2/setup-msys2@v2
         with:
           update: true
-          install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool mingw-w64-x86_64-libiconv
+          install: "mingw-w64-x86_64-toolchain mingw-w64-x86_64-libtool
                     mingw-w64-x86_64-meson mingw-w64-x86_64-ninja
                     mingw-w64-x86_64-protobuf
                     mingw-w64-x86_64-libxml2

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -562,11 +562,6 @@ if (TARGET harfbuzz::harfbuzz)
 else ()
   message(STATUS "- harfbuzz:                      FALSE")
 endif ()
-if (TARGET Iconv::Iconv)
-  message(STATUS "- Iconv:                         TRUE")
-else ()
-  message(STATUS "- Iconv:                         FALSE")
-endif ()
 if (TARGET LibLZMA::LibLZMA)
   message(STATUS "- LibLZMA:                       TRUE")
 else ()

diff --git a/libosmscout/CMakeLists.txt b/libosmscout/CMakeLists.txt
@@ -403,10 +403,6 @@ if(MARISA_FOUND)
     target_link_libraries(OSMScout ${MARISA_LIBRARIES})
 endif()
 
-if (TARGET Iconv::Iconv)
-    target_link_libraries(OSMScout Iconv::Iconv)
-endif()
-
 if(CMAKE_THREAD_LIBS_INIT)
     target_link_libraries(OSMScout ${CMAKE_THREAD_LIBS_INIT})
 endif()