[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdemultimedia/cmake/modules
From: Laurent Montel <montel () kde ! org>
Date: 2007-03-28 12:45:33
Message-ID: 1175085933.025948.10490.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 647473 by mlaurent:
kioslave/audiocd/flac plugins needs FLAC__stream_encoder_set_write_callback
=> test it
M +10 -6 FindFlac.cmake
--- trunk/KDE/kdemultimedia/cmake/modules/FindFlac.cmake #647472:647473
@@ -14,7 +14,7 @@
if(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
# Already in cache, be silent
- set(FLAC_FIND_QUIETLY TRUE)
+ set(Flac_FIND_QUIETLY TRUE)
endif(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
FIND_PATH(FLAC_INCLUDE_DIR FLAC/metadata.h
@@ -31,17 +31,21 @@
FIND_LIBRARY(FLAC_OGG_LIBRARY NAMES OggFLAC
PATHS
/usr/lib
- /usr/local/lib
-)
+ /usr/local/lib
+ )
-IF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+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)
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)
+ELSE(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
SET(FLAC_FOUND FALSE)
-ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES)
+ENDIF(FLAC_INCLUDE_DIR AND FLAC_LIBRARIES AND HAVE_STREAM_ENCODER_WRITE_CALLBACK)
IF(FLAC_FOUND)
IF(NOT Flac_FIND_QUIETLY)
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic