diff options
| author | Vicent Marti <vicent@github.com> | 2014-01-29 19:10:00 -0800 |
|---|---|---|
| committer | Vicent Marti <vicent@github.com> | 2014-01-29 19:10:00 -0800 |
| commit | 0316d80ac0d9cde335467576ad61005963015cfc (patch) | |
| tree | 95e9315f2e8fa5c45da1a3ea7802949924975007 | |
| parent | 2d3cc3ed01cdcd75bd323edaf77cd47bbdb606d3 (diff) | |
| parent | 4bc94eb5f049d1d0fd23128b05bb0d65ffac84d9 (diff) | |
| download | libgit2-0316d80ac0d9cde335467576ad61005963015cfc.tar.gz | |
Merge pull request #2089 from scunz/cmake_path
We never search for libiconv via pkg-config
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | cmake/Modules/FindIconv.cmake | 2 |
2 files changed, 2 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4483be338..6f2a2bb82 100644 --- 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 f1406c557..c5a419011 100644 --- 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}") |