Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
liblinphone
Commits
bc970661
Commit
bc970661
authored
Jun 13, 2018
by
Ronan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(CMakeLists.txt): use FindZLIB from cmake
parent
563dfbaa
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
65 deletions
+1
-65
CMakeLists.txt
CMakeLists.txt
+1
-1
cmake/FindZlib.cmake
cmake/FindZlib.cmake
+0
-64
No files found.
CMakeLists.txt
View file @
bc970661
...
...
@@ -136,7 +136,7 @@ endif()
find_package
(
XML2 REQUIRED
)
find_package
(
LibXsd REQUIRED
)
find_package
(
Soci
)
find_package
(
Z
lib
)
find_package
(
Z
LIB
)
if
(
ENABLE_TUNNEL
)
if
(
LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS
)
include
(
"
${
EP_tunnel_CONFIG_DIR
}
/TunnelConfig.cmake"
)
...
...
cmake/FindZlib.cmake
deleted
100644 → 0
View file @
563dfbaa
############################################################################
# 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, 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
if
(
APPLE AND NOT IOS
)
set
(
ZLIB_HINTS
"/usr"
)
endif
()
if
(
ZLIB_HINTS
)
set
(
ZLIB_LIBRARIES_HINTS
"
${
ZLIB_HINTS
}
/lib"
)
endif
()
find_path
(
ZLIB_INCLUDE_DIRS
NAMES zlib.h
HINTS
"
${
ZLIB_HINTS
}
"
PATH_SUFFIXES include
)
if
(
ZLIB_INCLUDE_DIRS
)
set
(
HAVE_ZLIB_H 1
)
endif
()
if
(
ENABLE_STATIC
)
find_library
(
ZLIB_LIBRARIES
NAMES zstatic zlibstatic zlibstaticd z
HINTS
"
${
ZLIB_LIBRARIES_HINTS
}
"
)
else
()
find_library
(
ZLIB_LIBRARIES
NAMES z zlib zlibd
HINTS
"
${
ZLIB_LIBRARIES_HINTS
}
"
)
endif
()
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
)
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