diff options
| author | Sascha Cunz <sascha.cunz@gmail.com> | 2014-01-30 06:30:55 +0400 |
|---|---|---|
| committer | Sascha Cunz <sascha.cunz@gmail.com> | 2014-01-30 06:35:09 +0400 |
| commit | 6e0ff093fb955adeeeed5c83a0fafc568d4b8074 (patch) | |
| tree | ead9ed91d2863dc4596a397c5b887f3ec68d746b /CMakeLists.txt | |
| parent | 39949f0604cb009d850ff080f630ccdf7ab11715 (diff) | |
Find and use a MacPorts version of libiconv. Fixes #2017.
- Add correct -I, -L and -l flags
- Search for libiconv in /opt/local/[include|lib] before in the
system path. See #2017 for details.
- Give splitted -L and -l arguments to pkg-config
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 611cd9eec..4483be338 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -202,8 +202,9 @@ IF (USE_ICONV) 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} -liconv") + SET(LIBGIT2_PC_LIBS "${LIBGIT2_PC_LIBS} ${ICONV_LIBRARIES}") ELSE() SET(LIBGIT2_PC_REQUIRES "${LIBGIT2_PC_REQUIRES} iconv") ENDIF() |