From 6fbe5347cd9211a6d3ed39bfa63f14b7e00dfd69 Mon Sep 17 00:00:00 2001 From: Alex Merry Date: Mon, 28 Jan 2008 14:56:13 +0000 Subject: Backport fix for FLAC > 1.1.2. CCBUG: 153503 svn path=/branches/KDE/4.0/kdelibs/; revision=767696 --- modules/FindFlac.cmake | 11 ++++++----- 1 file 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, # Copyright (c) 2006, Alexander Neundorf, @@ -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) -- cgit v1.2.1