Skip to content

G
git2
Commit 0316d80a by Vicent Marti
Options

Merge pull request #2089 from scunz/cmake_path 

We never search for libiconv via pkg-config
parents 2d3cc3ed 4bc94eb5
Showing with 1 additions and 5 deletions
CMakeLists.txt
...@@ -203,11 +203,7 @@ ENDIF() ...@@ -203,11 +203,7 @@ ENDIF()
IF (ICONV_FOUND) IF (ICONV_FOUND)
ADD_DEFINITIONS(-DGIT_USE_ICONV) ADD_DEFINITIONS(-DGIT_USE_ICONV)
INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR})
IF(ICONV_LIBRARIES MATCHES "libiconv")
SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${ICONV_LIBRARIES}") SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${ICONV_LIBRARIES}")
ELSE()
SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} iconv")
ENDIF()
ENDIF() ENDIF()
# Platform specific compilation flags # Platform specific compilation flags
......
cmake/Modules/FindIconv.cmake
...@@ -26,7 +26,7 @@ IF(ICONV_FOUND) ...@@ -26,7 +26,7 @@ IF(ICONV_FOUND)
GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH) GET_FILENAME_COMPONENT(iconv_path ${iconv_lib} PATH)
GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE) GET_FILENAME_COMPONENT(iconv_name ${iconv_lib} NAME_WE)
STRING(REGEX REPLACE "^lib" "" iconv_name ${iconv_name}) 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) IF(NOT ICONV_FIND_QUIETLY)
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment