[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [k3b/2.0] plugins/decoder/ffmpeg: fix for newer (kde-4.7+) FindFFMPEG.cmake
From:       Rex Dieter <rdieter () math ! unl ! edu>
Date:       2013-09-30 18:50:17
Message-ID: E1VQiXx-0004kV-DS () scm ! kde ! org
[Download RAW message or body]

Git commit 3a4052b88219874989235965e0a9fbe64a20989a by Rex Dieter.
Committed on 11/02/2012 at 14:34.
Pushed by rdieter into branch '2.0'.

fix for newer (kde-4.7+) FindFFMPEG.cmake
which sets ${FFMPEG_INCLUDE_DIRS} instead of ${FFMPEG_INCLUDE_DIR}

M  +1    -1    plugins/decoder/ffmpeg/CMakeLists.txt

http://commits.kde.org/k3b/3a4052b88219874989235965e0a9fbe64a20989a

diff --git a/plugins/decoder/ffmpeg/CMakeLists.txt b/plugins/decoder/ffmpeg=
/CMakeLists.txt
index d7e25eb..d420a3c 100644
--- a/plugins/decoder/ffmpeg/CMakeLists.txt
+++ b/plugins/decoder/ffmpeg/CMakeLists.txt
@@ -9,7 +9,7 @@ if(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 else(FFMPEG_INCLUDE_DIR_OLD_STYLE)
     message(STATUS "found new ffmpegcodecpath")
     add_definitions(-DNEWFFMPEGAVCODECPATH)
-    include_directories (${FFMPEG_INCLUDE_DIR})
+    include_directories (${FFMPEG_INCLUDE_DIR} ${FFMPEG_INCLUDE_DIRS})
 endif(FFMPEG_INCLUDE_DIR_OLD_STYLE)
 =

 set(k3bffmpegdecoder_PART_SRCS k3bffmpegdecoder.cpp k3bffmpegwrapper.cpp )
[prev in list] [next in list] [prev in thread] [next in thread]