cmake: Properly link to swscale.

diff --git a/extras/buildsystem/cmake/include/FindFFmpeg.cmake b/extras/buildsystem/cmake/include/FindFFmpeg.cmake
index 679e14f9c947c14e4d829ba18fc4c527bff5ef35..8dd7948ee2d81441d6f53ae4e1641e7389d097fe 100644 (file)
--- a/extras/buildsystem/cmake/include/FindFFmpeg.cmake
+++ b/extras/buildsystem/cmake/include/FindFFmpeg.cmake
@@ -16,7 +16,7 @@ if (NOT FFmpeg_SEARCHED)
 
     if (NOT FFmpeg_FOUND)
         set(FFmpeg_LIBRARIES "")
-        foreach (library ffmpeg avcodec avformat avutil postproc)
+        foreach (library ffmpeg avcodec avformat avutil postproc swscale)
             find_library( ${library}_LIBRARY ${library} )
             set( ${library}_LIBRARY_FOUND NOT ${${library}_LIBRARY} )
             if (${library}_LIBRARY_FOUND)

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index 6946d3d66946ff9c943025ffded059cf4ec59750..229606d31ca67ff9a6eee1e6b9510b8f99c6ab90 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -196,7 +196,9 @@ if(APPLE)
     include( ${CMAKE_SOURCE_DIR}/cmake/vlc_find_frameworks.cmake )
 
     if(ENABLE_NO_SYMBOL_CHECK)
-        set(DYNAMIC_LOOKUP "-undefined dynamic_lookup" CACHE INTERNAL STRING)
+        set(DYNAMIC_LOOKUP "-undefined dynamic_lookup")
+    else(ENABLE_NO_SYMBOL_CHECK)
+        set(DYNAMIC_LOOKUP)
     endif(ENABLE_NO_SYMBOL_CHECK)
     set(CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS
      "${CMAKE_SHARED_MODULE_CREATE_CXX_FLAGS} ${DYNAMIC_LOOKUP}")
@@ -371,6 +373,8 @@ find_package(FFmpeg)
 if(FFmpeg_FOUND)
   set(CMAKE_EXTRA_INCLUDE_FILES stdint.h)
   vlc_check_include_files (ffmpeg/avcodec.h)
+  vlc_check_include_files (ffmpeg/avutil.h)
+  vlc_check_include_files (ffmpeg/swscale.h)
   vlc_check_include_files (postproc/postprocess.h)
   set(CMAKE_EXTRA_INCLUDE_FILES)
   vlc_enable_modules(ffmpeg)