fix(drivers): fix curl and iconv dependencies. (#2075)

indilib · Jun 17, 2024 · 81f39f1 · 81f39f1
1 parent aa1cb9a
commit 81f39f1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 96 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -298,7 +298,7 @@ if(INDI_BUILD_DRIVERS)
         find_package(GSL REQUIRED)
         find_package(JPEG REQUIRED)
         find_library(M_LIB m)
-        if(CYGWIN)
+        if(CYGWIN OR UNIX)
             find_package(Iconv REQUIRED)
         endif()
 

diff --git a/cmake_modules/FindIconv.cmake b/cmake_modules/FindIconv.cmake
diff --git a/libs/hid/CMakeLists.txt b/libs/hid/CMakeLists.txt
@@ -43,8 +43,8 @@ install(FILES
 # ########## HID Test ##############
 if(APPLE)
     set(LIBS "-framework IOKit -framework CoreFoundation")
-elseif(CYGWIN)
-    set(LIBS ${ICONV_LIBRARIES})
+elseif(CYGWIN OR UNIX)
+    set(LIBS ${Iconv_LIBRARIES})
 endif()
 
 add_executable(indi_hid_test hidtest.cpp)

diff --git a/libs/indibase/CMakeLists.txt b/libs/indibase/CMakeLists.txt
@@ -24,14 +24,13 @@ list(APPEND ${PROJECT_NAME}_LIBS
     ${JPEG_LIBRARY}
     ${FFTW3_LIBRARIES}
     ${M_LIB}
-    $<$<PLATFORM_ID:CYGWIN>:${ICONV_LIBRARIES}>
+    ${CURL}
 )
 
-# Add Iconv
-if(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-    # FreeBSD needs to find the correct GNU iconv library.
+# Add Iconv - FreeBSD needs to find the correct GNU iconv library.
+if(CYGWIN OR UNIX OR (CMAKE_SYSTEM_NAME MATCHES "FreeBSD"))
     find_package(Iconv REQUIRED)
-    list(APPEND ${PROJECT_NAME}_LIBS ${ICONV_LIBRARIES})
+    list(APPEND ${PROJECT_NAME}_LIBS ${Iconv_LIBRARIES})
 endif()
 
 # Add WebSocket