Commit fb01f78b authored by louiz’'s avatar louiz’

Rewrite the FindIconv module cleanly

parent 2c9680bc
...@@ -23,7 +23,7 @@ find_package(EXPAT REQUIRED) ...@@ -23,7 +23,7 @@ find_package(EXPAT REQUIRED)
include_directories("src/") include_directories("src/")
include_directories(${EXPAT_INCLUDE_DIRS}) include_directories(${EXPAT_INCLUDE_DIRS})
include_directories(${ICONV_INCLUDE_DIR}) include_directories(${ICONV_INCLUDE_DIRS})
# the SYSTEM flag tells the compiler that we don't care about warnings # the SYSTEM flag tells the compiler that we don't care about warnings
# coming from these headers. # coming from these headers.
include_directories(SYSTEM ${CRYPTO++_INCLUDE_DIRS}) include_directories(SYSTEM ${CRYPTO++_INCLUDE_DIRS})
......
# - Try to find Iconv # - Find iconv
# Once done this will define # Find the iconv (character set conversion) library
# #
# ICONV_FOUND - system has Iconv # This module defines the following variables:
# ICONV_INCLUDE_DIR - the Iconv include directory # ICONV_FOUND - True if library and include directory are found
# ICONV_LIBRARIES - Link these to use Iconv # If set to TRUE, the following are also defined:
# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const # ICONV_INCLUDE_DIRS - The directory where to find the header file
# ICONV_LIBRARIES - Where to find the library file
# ICONV_SECOND_ARGUMENT_IS_CONST - The second argument for iconv() is const
# #
include(CheckCXXSourceCompiles) # For conveniance, these variables are also set. They have the same values
# than the variables above. The user can thus choose his/her prefered way
IF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) # to way to write them.
# Already in cache, be silent # ICONV_LIBRARY
SET(ICONV_FIND_QUIETLY TRUE) # ICONV_INCLUDE_DIR
ENDIF (ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) #
# This file is in the public domain
FIND_PATH(ICONV_INCLUDE_DIR iconv.h) find_path(ICONV_INCLUDE_DIRS NAMES iconv.h
DOC "The iconv include directory")
FIND_LIBRARY(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c) find_library(ICONV_LIBRARIES NAMES iconv libiconv libiconv-2 c
DOC "The iconv library")
IF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) # Use some standard module to handle the QUIETLY and REQUIRED arguments, and
SET(ICONV_FOUND TRUE) # set ICONV_FOUND to TRUE if these two variables are set.
ENDIF(ICONV_INCLUDE_DIR AND ICONV_LIBRARIES) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Iconv REQUIRED_VARS ICONV_LIBRARIES ICONV_INCLUDE_DIRS)
set(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR}) # Check if the prototype is
set(CMAKE_REQUIRED_LIBRARIES ${ICONV_LIBRARIES}) # size_t iconv(iconv_t cd, char** inbuf, size_t* inbytesleft,
IF(ICONV_FOUND) # char** outbuf, size_t* outbytesleft);
# or
# size_t iconv (iconv_t cd, const char** inbuf, size_t* inbytesleft,
# char** outbuf, size_t* outbytesleft);
if(ICONV_FOUND)
include(CheckCXXSourceCompiles)
check_cxx_source_compiles(" check_cxx_source_compiles("
#include <iconv.h> #include <iconv.h>
int main(){ int main(){
...@@ -33,25 +44,12 @@ IF(ICONV_FOUND) ...@@ -33,25 +44,12 @@ IF(ICONV_FOUND)
char* out = 0; char* out = 0;
size_t olen = 0; size_t olen = 0;
iconv(conv, &in, &ilen, &out, &olen); iconv(conv, &in, &ilen, &out, &olen);
return 0; return 0;}"
} ICONV_SECOND_ARGUMENT_IS_CONST)
" ICONV_SECOND_ARGUMENT_IS_CONST )
ENDIF(ICONV_FOUND)
set(CMAKE_REQUIRED_INCLUDES)
set(CMAKE_REQUIRED_LIBRARIES)
IF(ICONV_FOUND) # Compatibility for all the ways of writing these variables
IF(NOT ICONV_FIND_QUIETLY) set(ICONV_LIBRARY ${ICONV_LIBRARIES})
MESSAGE(STATUS "Found Iconv: ${ICONV_LIBRARIES}") set(ICONV_INCLUDE_DIR ${ICONV_INCLUDE_DIRS})
ENDIF(NOT ICONV_FIND_QUIETLY) endif()
ELSE(ICONV_FOUND)
IF(Iconv_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find Iconv")
ENDIF(Iconv_FIND_REQUIRED)
ENDIF(ICONV_FOUND)
MARK_AS_ADVANCED( mark_as_advanced(ICONV_INCLUDE_DIRS ICONV_LIBRARIES ICONV_SECOND_ARGUMENT_IS_CONST)
ICONV_INCLUDE_DIR \ No newline at end of file
ICONV_LIBRARIES
ICONV_SECOND_ARGUMENT_IS_CONST
)
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment