Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
biboumi
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
90
Issues
90
List
Boards
Labels
Service Desk
Milestones
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
louiz’
biboumi
Commits
fb01f78b
Commit
fb01f78b
authored
Dec 08, 2013
by
louiz’
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rewrite the FindIconv module cleanly
parent
2c9680bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
39 additions
and
41 deletions
+39
-41
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/Modules/FindIconv.cmake
cmake/Modules/FindIconv.cmake
+38
-40
No files found.
CMakeLists.txt
View file @
fb01f78b
...
...
@@ -23,7 +23,7 @@ find_package(EXPAT REQUIRED)
include_directories
(
"src/"
)
include_directories
(
${
EXPAT_INCLUDE_DIRS
}
)
include_directories
(
${
ICONV_INCLUDE_DIR
}
)
include_directories
(
${
ICONV_INCLUDE_DIR
S
}
)
# the SYSTEM flag tells the compiler that we don't care about warnings
# coming from these headers.
include_directories
(
SYSTEM
${
CRYPTO++_INCLUDE_DIRS
}
)
...
...
cmake/Modules/FindIconv.cmake
View file @
fb01f78b
# -
Try to find I
conv
#
Once done this will define
# -
Find i
conv
#
Find the iconv (character set conversion) library
#
# ICONV_FOUND - system has Iconv
# ICONV_INCLUDE_DIR - the Iconv include directory
# ICONV_LIBRARIES - Link these to use Iconv
# ICONV_SECOND_ARGUMENT_IS_CONST - the second argument for iconv() is const
# This module defines the following variables:
# ICONV_FOUND - True if library and include directory are found
# If set to TRUE, the following are also defined:
# 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
)
IF
(
ICONV_INCLUDE_DIR AND ICONV_LIBRARIES
)
# Already in cache, be silent
SET
(
ICONV_FIND_QUIETLY TRUE
)
ENDIF
(
ICONV_INCLUDE_DIR AND ICONV_LIBRARIES
)
# 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
# to way to write them.
# ICONV_LIBRARY
# ICONV_INCLUDE_DIR
#
# 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
)
SET
(
ICONV_FOUND TRUE
)
ENDIF
(
ICONV_INCLUDE_DIR AND ICONV_LIBRARIES
)
# Use some standard module to handle the QUIETLY and REQUIRED arguments, and
# set ICONV_FOUND to TRUE if these two variables are set.
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Iconv REQUIRED_VARS ICONV_LIBRARIES ICONV_INCLUDE_DIRS
)
set
(
CMAKE_REQUIRED_INCLUDES
${
ICONV_INCLUDE_DIR
}
)
set
(
CMAKE_REQUIRED_LIBRARIES
${
ICONV_LIBRARIES
}
)
IF
(
ICONV_FOUND
)
# Check if the prototype is
# size_t iconv(iconv_t cd, char** inbuf, size_t* inbytesleft,
# 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
(
"
#include <iconv.h>
int main(){
...
...
@@ -33,25 +44,12 @@ IF(ICONV_FOUND)
char* out = 0;
size_t olen = 0;
iconv(conv, &in, &ilen, &out, &olen);
return 0;
}
"
ICONV_SECOND_ARGUMENT_IS_CONST
)
ENDIF
(
ICONV_FOUND
)
set
(
CMAKE_REQUIRED_INCLUDES
)
set
(
CMAKE_REQUIRED_LIBRARIES
)
return 0;}"
ICONV_SECOND_ARGUMENT_IS_CONST
)
IF
(
ICONV_FOUND
)
IF
(
NOT ICONV_FIND_QUIETLY
)
MESSAGE
(
STATUS
"Found Iconv:
${
ICONV_LIBRARIES
}
"
)
ENDIF
(
NOT ICONV_FIND_QUIETLY
)
ELSE
(
ICONV_FOUND
)
IF
(
Iconv_FIND_REQUIRED
)
MESSAGE
(
FATAL_ERROR
"Could not find Iconv"
)
ENDIF
(
Iconv_FIND_REQUIRED
)
ENDIF
(
ICONV_FOUND
)
# Compatibility for all the ways of writing these variables
set
(
ICONV_LIBRARY
${
ICONV_LIBRARIES
}
)
set
(
ICONV_INCLUDE_DIR
${
ICONV_INCLUDE_DIRS
}
)
endif
()
MARK_AS_ADVANCED
(
ICONV_INCLUDE_DIR
ICONV_LIBRARIES
ICONV_SECOND_ARGUMENT_IS_CONST
)
\ No newline at end of file
mark_as_advanced
(
ICONV_INCLUDE_DIRS ICONV_LIBRARIES ICONV_SECOND_ARGUMENT_IS_CONST
)
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment