From: Pierre d'Herbemont Date: Thu, 7 Feb 2008 17:20:33 +0000 (+0000) Subject: cmake: Set ICONV_CONST correctly. X-Git-Tag: 0.9.0-test0~2853 X-Git-Url: https://git.videolan.org/gitweb.cgi/vlc.git/?p=vlc.git;p=vlc.git;a=commitdiff_plain;h=f83cca6e062c09cff096fdbdf5b980e4a332e0e2 cmake: Set ICONV_CONST correctly. --- diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake index 4d9d8b506a..ea91d3c9a8 100644 --- a/extras/buildsystem/cmake/include/config.cmake +++ b/extras/buildsystem/cmake/include/config.cmake @@ -104,15 +104,18 @@ if(NOT HAVE_GETADDRINFO) check_library_exists(getaddrinfo nsl "" HAVE_GETADDRINFO) endif(NOT HAVE_GETADDRINFO) -set(LIBICONV "") vlc_check_functions_exist(iconv) - if(NOT HAVE_ICONV) set(LIBICONV "iconv") check_library_exists(iconv iconv "" HAVE_ICONV) endif(NOT HAVE_ICONV) -# FIXME: this will break on *BSD: -set( ICONV_CONST "" ) +CHECK_C_SOURCE_COMPILES(" #include + int main() { return iconv(0, (char **)0, 0, (char**)0, 0); }" ICONV_NO_CONST) +if( ICONV_NO_CONST ) + set( ICONV_CONST "const" ) +else( ICONV_NO_CONST ) + set( ICONV_CONST " ") +endif( ICONV_NO_CONST ) check_library_exists(rt clock_nanosleep "" HAVE_CLOCK_NANOSLEEP) if (HAVE_CLOCK_NANOSLEEP)