From bc9706613a695f103016152298e72e377b642fe6 Mon Sep 17 00:00:00 2001 From: Ronan Abhamon Date: Wed, 13 Jun 2018 15:34:58 +0200 Subject: [PATCH] feat(CMakeLists.txt): use FindZLIB from cmake --- CMakeLists.txt | 2 +- cmake/FindZlib.cmake | 64 -------------------------------------------- 2 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 cmake/FindZlib.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ee2ecc62..fee1f725e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,7 +136,7 @@ endif() find_package(XML2 REQUIRED) find_package(LibXsd REQUIRED) find_package(Soci) -find_package(Zlib) +find_package(ZLIB) if(ENABLE_TUNNEL) if(LINPHONE_BUILDER_GROUP_EXTERNAL_SOURCE_PATH_BUILDERS) include("${EP_tunnel_CONFIG_DIR}/TunnelConfig.cmake") diff --git a/cmake/FindZlib.cmake b/cmake/FindZlib.cmake deleted file mode 100644 index 8f7e23430..000000000 --- a/cmake/FindZlib.cmake +++ /dev/null @@ -1,64 +0,0 @@ -############################################################################ -# 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)