Commit 81472e42 authored by Faustino Osuna's avatar Faustino Osuna
Browse files

cmake: Source code clean up, fix how CFLAGS are saved, and compensate for latest changes in ffmpeg.

parent 5458d5a1
......@@ -5,7 +5,6 @@
# FFmpeg_LIBRARIES - Link these to use FFmpeg.
# FFmpeg_CFLAGS - Link these to use FFmpeg.
if (NOT FFmpeg_SEARCHED)
include(CheckLibraryExists)
......@@ -19,31 +18,37 @@ if (NOT FFmpeg_SEARCHED)
foreach (library ffmpeg avcodec avformat avutil postproc swscale)
find_library( ${library}_LIBRARY ${library} )
if (${library}_LIBRARY)
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_CFLAGS "${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS}")
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
set(FFmpeg_FOUND TRUE CACHE INTERNAL "")
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
if (${library}_LIBRARY_CFLAGS)
set(FFmpeg_CFLAGS ${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS})
endif (${library}_LIBRARY_CFLAGS)
set(FFmpeg_FOUND TRUE CACHE INTERNAL "")
endif (${library}_LIBRARY)
endforeach (library)
foreach (library a52 faac lame z png mp3lame twolame)
find_library( ${library}_LIBRARY ${library} )
if (${library}_LIBRARY)
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_CFLAGS "${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS}")
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
pkg_check_modules(${library}_LIBRARY lib${library})
set(FFmpeg_LIBRARIES "${library};${FFmpeg_LIBRARIES}")
if (${library}_LIBRARY_CFLAGS)
set(FFmpeg_CFLAGS ${FFmpeg_CFLAGS} ${${library}_LIBRARY_CFLAGS})
endif (${library}_LIBRARY_CFLAGS)
endif (${library}_LIBRARY)
endforeach (library)
set(FFmpeg_LIBRARIES "${FFmpeg_LIBRARIES}" CACHE INTERNAL STRING)
endif (NOT FFmpeg_FOUND)
if (FFmpeg_FOUND)
if (NOT FFmpeg_FIND_QUIETLY)
message(STATUS "Found FFmpeg in: ${FFmpeg_LIBRARIES}")
endif (NOT FFmpeg_FIND_QUIETLY)
if (NOT FFmpeg_FIND_QUIETLY)
message(STATUS "Found FFmpeg in: ${FFmpeg_LIBRARIES}")
endif (NOT FFmpeg_FIND_QUIETLY)
else (FFmpeg_FOUND)
if (FFmpeg_FIND_REQUIRED)
message(FATAL_ERROR "Could not find the library containing FFmpeg")
endif (FFmpeg_FIND_REQUIRED)
if (FFmpeg_FIND_REQUIRED)
message(FATAL_ERROR "Could not find the library containing FFmpeg")
endif (FFmpeg_FIND_REQUIRED)
endif (FFmpeg_FOUND)
mark_as_advanced(FFmpeg_LIBRARIES)
......
......@@ -339,6 +339,7 @@ if(APPLE)
COMMAND find ${CMAKE_BINARY_DIR}/po -name *.gmo -exec sh -c \"mkdir -p ${MacOS}/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES\; ln -s {} ${MacOS}/locale/\\`basename {}|sed s/\\.gmo//\\`/LC_MESSAGES/vlc.mo\" "\;"
COMMAND ln -sf VLC ${MacOS}/clivlc #useless?
COMMAND printf "APPLVLC#" > ${CMAKE_CURRENT_BINARY_DIR}/VLC.app/Contents/PkgInfo
COMMAND rm -Rf ${CMAKE_CURRENT_BINARY_DIR}/tmp
)
set( MacOS )
......@@ -446,17 +447,18 @@ endif (${ALSA_FOUND})
find_package(FFmpeg)
if(FFmpeg_FOUND)
string(REPLACE ";" " " FFmpeg_CFLAGS "${FFmpeg_CFLAGS}")
set( CMAKE_REQUIRED_FLAGS_saved ${CMAKE_REQUIRED_FLAGS} )
set( CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} ${FFmpeg_CFLAGS}" )
#set( CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${CONTRIB_INCLUDE}/ffmpeg )
set( CMAKE_REQUIRED_FLAGS ${FFmpeg_CFLAGS} )
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 (swscale.h)
check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
vlc_enable_modules(ffmpeg)
vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS} )
vlc_add_module_compile_flag(ffmpeg ${FFmpeg_CFLAGS})
vlc_module_add_link_libraries(ffmpeg ${FFmpeg_LIBRARIES})
set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS_saved} )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment