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
e57b0da0
Commit
e57b0da0
authored
Mar 23, 2015
by
Ghislain MARY
Browse files
Add check for zlib when building with CMake.
parent
f520a87d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
65 additions
and
1 deletion
+65
-1
CMakeLists.txt
CMakeLists.txt
+5
-0
cmake/FindZlib.cmake
cmake/FindZlib.cmake
+55
-0
config.h.cmake
config.h.cmake
+2
-1
coreapi/CMakeLists.txt
coreapi/CMakeLists.txt
+3
-0
No files found.
CMakeLists.txt
View file @
e57b0da0
...
...
@@ -94,6 +94,7 @@ endif()
find_package
(
BelleSIP REQUIRED
)
find_package
(
Mediastreamer2 REQUIRED
)
find_package
(
XML2 REQUIRED
)
find_package
(
Zlib
)
if
(
ENABLE_UNIT_TESTS
)
find_package
(
CUnit
)
if
(
CUNIT_FOUND
)
...
...
@@ -148,6 +149,10 @@ include_directories(
${
MEDIASTREAMER2_INCLUDE_DIRS
}
${
XML2_INCLUDE_DIRS
}
)
if
(
ZLIB_FOUND
)
include_directories
(
${
ZLIB_INCLUDE_DIRS
}
)
set
(
HAVE_ZLIB 1
)
endif
()
if
(
SQLITE3_FOUND
)
include_directories
(
${
SQLITE3_INCLUDE_DIRS
}
)
add_definitions
(
"-DMSG_STORAGE_ENABLED"
)
...
...
cmake/FindZlib.cmake
0 → 100644
View file @
e57b0da0
############################################################################
# FindZlib.txt
# Copyright (C) 2015 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 zlib include file and library
#
# ZLIB_FOUND - system has zlib
# ZLIB_INCLUDE_DIRS - the zlib include directory
# ZLIB_LIBRARIES - The libraries needed to use zlib
set
(
_ZLIB_ROOT_PATHS
${
CMAKE_INSTALL_PREFIX
}
)
find_path
(
ZLIB_INCLUDE_DIRS
NAMES zlib.h
HINTS _ZLIB_ROOT_PATHS
PATH_SUFFIXES include
)
if
(
ZLIB_INCLUDE_DIRS
)
set
(
HAVE_ZLIB_H 1
)
endif
()
find_library
(
ZLIB_LIBRARIES
NAMES z zlib zlibd
HINTS
${
_ZLIB_ROOT_PATHS
}
PATH_SUFFIXES bin lib
)
include
(
FindPackageHandleStandardArgs
)
find_package_handle_standard_args
(
Zlib
DEFAULT_MSG
ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES HAVE_ZLIB_H
)
mark_as_advanced
(
ZLIB_INCLUDE_DIRS ZLIB_LIBRARIES HAVE_ZLIB_H
)
config.h.cmake
View file @
e57b0da0
...
...
@@ -39,5 +39,6 @@
#cmakedefine BUILD_WIZARD
#cmakedefine HAVE_NOTIFY4
#cmakedefine HAVE_ZLIB 1
#cmakedefine HAVE_CU_GET_SUITE 1
#cmakedefine HAVE_CU_CURSES 1
\ No newline at end of file
#cmakedefine HAVE_CU_CURSES 1
coreapi/CMakeLists.txt
View file @
e57b0da0
...
...
@@ -127,6 +127,9 @@ set(LIBS
${
MEDIASTREAMER2_LIBRARIES
}
${
XML2_LIBRARIES
}
)
if
(
ZLIB_FOUND
)
list
(
APPEND LIBS
${
ZLIB_LIBRARIES
}
)
endif
()
if
(
SQLITE3_FOUND
)
list
(
APPEND LIBS
${
SQLITE3_LIBRARIES
}
)
endif
()
...
...
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