mirror of
https://github.com/taglib/taglib.git
synced 2025-05-27 21:20:26 -04:00
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:
parent
0da49842dd
commit
074d47460e
@ -1,7 +1,5 @@
|
||||
project(taglib)
|
||||
|
||||
find_package(ZLIB)
|
||||
|
||||
OPTION(BUILD_TESTS "Create tests and examples" OFF)
|
||||
|
||||
#add some KDE specific stuff
|
||||
|
@ -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)
|
||||
|
@ -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 )
|
||||
|
Loading…
Reference in New Issue
Block a user