diff options
| author | David Faure <faure@kde.org> | 2007-12-03 15:55:23 +0000 |
|---|---|---|
| committer | David Faure <faure@kde.org> | 2007-12-03 15:55:23 +0000 |
| commit | 80cf7b857ae38ad933433dd977d408718fce7fe0 (patch) | |
| tree | be57124458029b20792989270c0dfb9cec9a9f7b | |
| parent | 965e3c90e0f222afe23255c694103b922c5cf602 (diff) | |
| download | extra-cmake-modules-80cf7b857ae38ad933433dd977d408718fce7fe0.tar.gz extra-cmake-modules-80cf7b857ae38ad933433dd977d408718fce7fe0.tar.bz2 | |
Putting NOTFOUND together with other libs in a variable doesn't give good results;
this could still be improved though, if some of these libs are indeed optional.
svn path=/trunk/KDE/kdelibs/; revision=744437
| -rw-r--r-- | modules/FindFFmpeg.cmake | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/modules/FindFFmpeg.cmake b/modules/FindFFmpeg.cmake index 0ec576a9..9768949d 100644 --- a/modules/FindFFmpeg.cmake +++ b/modules/FindFFmpeg.cmake @@ -50,7 +50,18 @@ ENDIF (NOT WIN32) NO_DEFAULT_PATH ) - set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARIES} ${AVFORMAT_LIBRARIES} ${AVUTIL_LIBRARIES}) + set(FFMPEG_LIBRARIES ) + if (AVCODEC_LIBRARIES) + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${AVCODEC_LIBRARIES}) + endif (AVCODEC_LIBRARIES) + + if (AVFORMAT_LIBRARIES) + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${AVFORMAT_LIBRARIES}) + endif (AVFORMAT_LIBRARIES) + + if (AVUTIL_LIBRARIES) + set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${AVUTIL_LIBRARIES}) + endif (AVUTIL_LIBRARIES) if (FFMPEG_LIBRARIES) set(FFMPEG_FOUND TRUE) |