Created
November 6, 2012 19:48
-
-
Save oyvindio/4027036 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- a/cmake/FindIconv.cmake 2012-01-08 11:15:28.000000000 +0100 | |
| +++ b/cmake/FindIconv.cmake 2012-11-06 20:42:29.000000000 +0100 | |
| @@ -49,9 +49,9 @@ | |
| 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) | |
| + CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
| IF(NOT ICONV_FOUND) | |
| - CHECK_LIBRARY_EXISTS(iconv iconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
| + CHECK_LIBRARY_EXISTS(iconv libiconv_open ${ICONV_LIB_PATH} ICONV_FOUND) | |
| ENDIF(NOT ICONV_FOUND) | |
| ELSE(ICONV_LIBRARY) | |
| CHECK_FUNCTION_EXISTS(iconv_open ICONV_FOUND) | |
| @@ -65,7 +65,6 @@ | |
| SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_PATH}) | |
| ENDIF(ICONV_LIBRARY) | |
| -SET(CMAKE_REQUIRED_FLAGS -Werror) | |
| check_c_source_compiles(" | |
| #include <iconv.h> | |
| int main(){ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment