From 074d47460ec6ff0771a5658a062990aaa836224c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= Date: Mon, 5 Nov 2007 01:58:56 +0000 Subject: [PATCH] Remove duplicate check for zlib and make zlib optional. git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/kdesupport/taglib@732907 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- CMakeLists.txt | 2 -- ConfigureChecks.cmake | 2 +- taglib/CMakeLists.txt | 4 +++- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a62c3ea7..90fc98d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,5 @@ project(taglib) -find_package(ZLIB) - OPTION(BUILD_TESTS "Create tests and examples" OFF) #add some KDE specific stuff diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 54eae95b..694b15c4 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -12,7 +12,7 @@ include(CheckTypeSize) include(CheckCXXSourceCompiles) #check for libz using the cmake supplied FindZLIB.cmake -FIND_PACKAGE(ZLIB REQUIRED) +FIND_PACKAGE(ZLIB) IF(ZLIB_FOUND) SET(HAVE_ZLIB 1) diff --git a/taglib/CMakeLists.txt b/taglib/CMakeLists.txt index 0fab9921..d1b83860 100644 --- a/taglib/CMakeLists.txt +++ b/taglib/CMakeLists.txt @@ -13,8 +13,10 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/ape ${CMAKE_CURRENT_BINARY_DIR}/taglib ${CMAKE_CURRENT_BINARY_DIR}/.. - ${ZLIB_INCLUDE_DIR} ) +if(ZLIB_FOUND) + INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +endif(ZLIB_FOUND) ADD_SUBDIRECTORY( toolkit ) ADD_SUBDIRECTORY( mpeg )