diff options
| author | Alex Merry <kde@randomguy3.me.uk> | 2008-01-28 14:53:28 +0000 |
|---|---|---|
| committer | Alex Merry <kde@randomguy3.me.uk> | 2008-01-28 14:53:28 +0000 |
| commit | 542ce625fe5ab6bbfbfe1ea8a8909695f5cf7788 (patch) | |
| tree | f7b6f902b76cfb328574a0a9cee70d51f64c04ad | |
| parent | d1d57cb86dc8890ae1995ae993ca2c8b424bd330 (diff) | |
| download | extra-cmake-modules-542ce625fe5ab6bbfbfe1ea8a8909695f5cf7788.tar.gz extra-cmake-modules-542ce625fe5ab6bbfbfe1ea8a8909695f5cf7788.tar.bz2 | |
Support FLAC > 1.1.2.
This does not remove support for FLAC 1.1.2.
BUG: 153503
svn path=/trunk/KDE/kdelibs/; revision=767695
| -rw-r--r-- | modules/FindFlac.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/modules/FindFlac.cmake b/modules/FindFlac.cmake index f1f54c42..0be8a407 100644 --- a/modules/FindFlac.cmake +++ b/modules/FindFlac.cmake @@ -5,6 +5,9 @@ # FLAC_INCLUDE_DIR - the Flac include directory # FLAC_LIBRARIES - Link these to use Flac # FLAC_OGGFLAC_LIBRARIES - Link these to use OggFlac +# +# No version checking is done - use FLAC_API_VERSION_CURRENT to +# conditionally compile version-dependent code # Copyright (c) 2006, Laurent Montel, <montel@kde.org> # Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org> @@ -23,18 +26,16 @@ FIND_LIBRARY(FLAC_LIBRARIES NAMES FLAC ) FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC) -check_library_exists(FLAC FLAC__stream_encoder_set_write_callback "" HAVE_STREAM_ENCODER_WRITE_CALLBACK) - -IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) SET(FLAC_FOUND TRUE) IF (FLAC_OGG_LIBRARY) SET(FLAC_OGGFLAC_LIBRARIES ${FLAC_OGG_LIBRARY} ${FLAC_LIBRARIES}) ENDIF (FLAC_OGG_LIBRARY) -ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) SET(FLAC_FOUND FALSE) -ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK) +ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES) IF(FLAC_FOUND) IF(NOT Flac_FIND_QUIETLY) |