Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
695ad3d6
Commit
695ad3d6
authored
Mar 02, 2015
by
Ghislain MARY
Browse files
Add FindIconv to CMake build.
parent
a0d870c7
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
64 additions
and
0 deletions
+64
-0
cmake/FindIconv.cmake
cmake/FindIconv.cmake
+56
-0
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+8
-0
No files found.
cmake/FindIconv.cmake
0 → 100644
View file @
695ad3d6
############################################################################
# FindIconv.cmake
# Copyright (C) 2014 Belledonne Communications, Grenoble France
#
############################################################################
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
############################################################################
#
# - Find the iconv include file and library
#
# ICONV_FOUND - system has libiconv
# ICONV_INCLUDE_DIRS - the libiconv include directory
# ICONV_LIBRARIES - The libraries needed to use libiconv
set
(
_ICONV_ROOT_PATHS
${
WITH_ICONV
}
${
CMAKE_INSTALL_PREFIX
}
)
find_path
(
ICONV_INCLUDE_DIRS
NAMES iconv.h
HINTS _ICONV_ROOT_PATHS
PATH_SUFFIXES include
)
if
(
ICONV_INCLUDE_DIRS
)
set
(
HAVE_ICONV_H 1
)
endif
()
find_library
(
ICONV_LIBRARIES
NAMES iconv
HINTS
${
_ICONV_ROOT_PATHS
}
PATH_SUFFIXES bin lib
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Iconv
DEFAULT_MSG
ICONV_INCLUDE_DIRS ICONV_LIBRARIES HAVE_ICONV_H
)
mark_as_advanced
(
ICONV_INCLUDE_DIRS ICONV_LIBRARIES HAVE_ICONV_H
)
coreapi/CMakeLists.txt
View file @
695ad3d6
...
...
@@ -25,6 +25,8 @@ if(MSVC)
find_library
(
LIBMINGWEX NAMES mingwex
)
endif
()
find_package
(
Iconv
)
set
(
SOURCE_FILES
address.c
...
...
@@ -124,6 +126,9 @@ set(LIBS
if
(
SQLITE3_FOUND
)
list
(
APPEND LIBS
${
SQLITE3_LIBRARIES
}
)
endif
()
if
(
ICONV_FOUND
)
list
(
APPEND LIBS
${
ICONV_LIBRARIES
}
)
endif
()
if
(
ENABLE_TUNNEL
)
list
(
APPEND LIBS
${
TUNNEL_LIBRARIES
}
)
endif
()
...
...
@@ -150,6 +155,9 @@ else()
endif
()
endif
()
endif
()
if
(
ICONV_FOUND
)
target_include_directories
(
linphone PUBLIC
${
ICONV_INCLUDE_DIRS
}
)
endif
()
install
(
TARGETS linphone
RUNTIME DESTINATION bin
...
...
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