Merge pull request #2089 from scunz/cmake_path

We never search for libiconv via pkg-config

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

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}")