pegasus/weechat
1
0
Fork 0
mirror of https://github.com/weechat/weechat.git synced 2026-07-04 00:33:13 +02:00
Code Activity

core: fix detection of iconv with cmake on OS X (bug #38321)

Browse Source
This commit is contained in:
Sebastien Helleu
2013-02-14 14:41:43 +01:00
parent 49043bf1b0
commit c37016e5ea
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+1
View File
@@ -7,6 +7,7 @@ v0.4.1-dev, 2013-02-12
Version 0.4.1 (under dev!)
--------------------------
* core: fix detection of iconv with cmake on OS X (bug #38321)
* core: add signal "window_opened" (task #12464)
* core: fix structures before buffer data when a buffer is closed
* core: fix refresh of line after changes with hdata_update (update flag
cmake/FindIconv.cmake
+5 -4
View File
@@ -49,10 +49,11 @@ FIND_LIBRARY(ICONV_LIBRARY
IF(ICONV_INCLUDE_PATH)
IF(ICONV_LIBRARY)
STRING(REGEX REPLACE "/[^/]*$" "" ICONV_LIB_PATH "${ICONV_LIBRARY}")
CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
IF(NOT ICONV_FOUND)
CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND)
ENDIF(NOT ICONV_FOUND)
CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} LIBICONV_OPEN_FOUND)
CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_OPEN_FOUND)
IF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
SET(ICONV_FOUND TRUE)
ENDIF(LIBICONV_OPEN_FOUND OR ICONV_OPEN_FOUND)
ELSE(ICONV_LIBRARY)
CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND)
ENDIF(ICONV_LIBRARY)