Fix FindIconv cmake module to correctly compile the c++ test code
This commit is contained in:
@@ -35,17 +35,22 @@ find_package_handle_standard_args(Iconv REQUIRED_VARS ICONV_LIBRARIES ICONV_INCL
|
|||||||
# char** outbuf, size_t* outbytesleft);
|
# char** outbuf, size_t* outbytesleft);
|
||||||
if(ICONV_FOUND)
|
if(ICONV_FOUND)
|
||||||
include(CheckCXXSourceCompiles)
|
include(CheckCXXSourceCompiles)
|
||||||
check_cxx_source_compiles("
|
|
||||||
#include <iconv.h>
|
# Set the parameters needed to compile the following code.
|
||||||
int main(){
|
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIRS})
|
||||||
iconv_t conv = 0;
|
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES})
|
||||||
const char* in = 0;
|
|
||||||
size_t ilen = 0;
|
check_cxx_source_compiles("
|
||||||
char* out = 0;
|
#include <iconv.h>
|
||||||
size_t olen = 0;
|
int main(){
|
||||||
iconv(conv, &in, &ilen, &out, &olen);
|
iconv_t conv = 0;
|
||||||
return 0;}"
|
const char* in = 0;
|
||||||
ICONV_SECOND_ARGUMENT_IS_CONST)
|
size_t ilen = 0;
|
||||||
|
char* out = 0;
|
||||||
|
size_t olen = 0;
|
||||||
|
iconv(conv, &in, &ilen, &out, &olen);
|
||||||
|
return 0;}"
|
||||||
|
ICONV_SECOND_ARGUMENT_IS_CONST)
|
||||||
|
|
||||||
# Compatibility for all the ways of writing these variables
|
# Compatibility for all the ways of writing these variables
|
||||||
set(ICONV_LIBRARY ${ICONV_LIBRARIES})
|
set(ICONV_LIBRARY ${ICONV_LIBRARIES})
|
||||||
|
|||||||
Reference in New Issue
Block a user