We never search for libiconv via pkg-config

So we actually also never know that we can set a dependency on it in
pkg-config. Instead always give it the -L and -l options.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4483be33879eaa599b6e2e9823db22ead902da4d..6f2a2bb82574422c2c9d4d5e99374efbc4f2183e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -203,11 +203,7 @@ ENDIF()
 IF (ICONV_FOUND)
        ADD_DEFINITIONS(-DGIT_USE_ICONV)
        INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
-       IF(ICONV_LIBRARIES MATCHES "libiconv")
-               SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${ICONV_LIBRARIES}")
-       ELSE()
-               SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} iconv")
-       ENDIF()
+       SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${ICONV_LIBRARIES}")
 ENDIF()
 
 # Platform specific compilation flags

diff --git a/cmake/Modules/FindIconv.cmake b/cmake/Modules/FindIconv.cmake
index f1406c5572167dda8e12bb5b84b4f27457d5415f..c5a419011bf08e8b1ed7560d296fbfab56b3911d 100644 (file)
--- a/cmake/Modules/FindIconv.cmake
+++ b/cmake/Modules/FindIconv.cmake
@@ -26,7 +26,7 @@ IF(ICONV_FOUND)
        GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH)
        GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE)
        STRING(REGEX REPLACE "^lib" "" iconv_name ${iconv_name})
-       SET(ICONV_LIBRARIES -L${iconv_path} -l${iconv_name})
+       SET(ICONV_LIBRARIES "-L${iconv_path} -l${iconv_name}")
 
        IF(NOT ICONV_FIND_QUIETLY)
                MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")