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
This commit is contained in:
Lukáš Lalinský 2007-11-05 01:58:56 +00:00
parent 0da49842dd
commit 074d47460e
3 changed files with 4 additions and 4 deletions

View File

@ -1,7 +1,5 @@
project(taglib)
find_package(ZLIB)
OPTION(BUILD_TESTS "Create tests and examples" OFF)
#add some KDE specific stuff

View File

@ -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)

View File

@ -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 )