mirror
/
openmw
mirror of https://github.com/OpenMW/openmw.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Rewrites FindFFmpeg using LibFindMacros handling components properly

Browse Source
pull/940/head
Roman Proskuryakov 9 years ago
parent 81dd164006
commit da59ef0f67
4 changed files with 84 additions and 138 deletions
Show Stats Download Patch File Download Diff File

10
CMakeLists.txt
Unescape Escape View File

@ -149,15 +149,7 @@ else()
endif() endif()
# Sound setup # Sound setup
unset(FFMPEG_LIBRARIES CACHE) find_package(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMPLE)
find_package(FFmpeg REQUIRED)
set (FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${SWSCALE_LIBRARY} ${SWRESAMPLE_LIBRARIES})
if ( NOT AVCODEC_FOUND OR NOT AVFORMAT_FOUND OR NOT AVUTIL_FOUND OR NOT SWSCALE_FOUND OR NOT SWRESAMPLE_FOUND)
message(FATAL_ERROR "FFmpeg component required, but not found!")
endif()
# Required for building the FFmpeg headers # Required for building the FFmpeg headers
add_definitions(-D__STDC_CONSTANT_MACROS) add_definitions(-D__STDC_CONSTANT_MACROS)

6
apps/openmw/CMakeLists.txt
Unescape Escape View File

@ -115,7 +115,7 @@ endif ()
# Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING # Sound stuff - here so CMake doesn't stupidly recompile EVERYTHING
# when we change the backend. # when we change the backend.
include_directories( include_directories(
${FFMPEG_INCLUDE_DIRS} ${FFmpeg_INCLUDE_DIRS}
) )
target_link_libraries(openmw target_link_libraries(openmw
@ -131,7 +131,7 @@ target_link_libraries(openmw
${Boost_FILESYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}
${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY}
${OPENAL_LIBRARY} ${OPENAL_LIBRARY}
${FFMPEG_LIBRARIES} ${FFmpeg_LIBRARIES}
${BULLET_LIBRARIES} ${BULLET_LIBRARIES}
${MYGUI_LIBRARIES} ${MYGUI_LIBRARIES}
${SDL2_LIBRARY} ${SDL2_LIBRARY}
@ -183,7 +183,7 @@ if(APPLE)
find_library(IOKIT_FRAMEWORK IOKit) find_library(IOKIT_FRAMEWORK IOKit)
target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK}) target_link_libraries(openmw ${COCOA_FRAMEWORK} ${IOKIT_FRAMEWORK})
if (FFMPEG_FOUND) if (FFmpeg_FOUND)
find_library(COREVIDEO_FRAMEWORK CoreVideo) find_library(COREVIDEO_FRAMEWORK CoreVideo)
find_library(VDA_FRAMEWORK VideoDecodeAcceleration) find_library(VDA_FRAMEWORK VideoDecodeAcceleration)
target_link_libraries(openmw ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK}) target_link_libraries(openmw ${COREVIDEO_FRAMEWORK} ${VDA_FRAMEWORK})

202
cmake/FindFFmpeg.cmake
Unescape Escape View File

@ -1,11 +1,14 @@
# vim: ts=2 sw=2 # vim: ts=2 sw=2
# - Try to find the required ffmpeg components(default: AVFORMAT, AVUTIL, AVCODEC) # - Try to find the required ffmpeg components
#
# This module accepts the following env variable
# FFMPEG_SDK - Can be set to custom install path
# #
# Once done this will define # Once done this will define
# FFMPEG_FOUND - System has the all required components. # FFmpeg_FOUND - System has the all required components.
# FFMPEG_INCLUDE_DIRS - Include directory necessary for using the required components headers. # FFmpeg_INCLUDE_DIRS - Include directory necessary for using the required components headers.
# FFMPEG_LIBRARIES - Link these to use the required ffmpeg components. # FFmpeg_LIBRARIES - Link these to use the required ffmpeg components.
# FFMPEG_DEFINITIONS - Compiler switches required for using the required ffmpeg components. # FFmpeg_DEFINITIONS - Compiler switches required for using the required ffmpeg components.
# #
# For each of the components it will additionaly set. # For each of the components it will additionaly set.
# - AVCODEC # - AVCODEC
@ -16,144 +19,95 @@
# - SWSCALE # - SWSCALE
# - SWRESAMPLE # - SWRESAMPLE
# the following variables will be defined # the following variables will be defined
# <component>_FOUND - System has <component> # FFmpeg_<component>_FOUND - System has <component>
# <component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers # FFmpeg_<component>_INCLUDE_DIRS - Include directory necessary for using the <component> headers
# <component>_LIBRARIES - Link these to use <component> # FFmpeg_<component>_LIBRARIES - Link these to use <component>
# <component>_DEFINITIONS - Compiler switches required for using <component> # FFmpeg_<component>_DEFINITIONS - Compiler switches required for using <component>
# <component>_VERSION - The components version # FFmpeg_<component>_VERSION - The components version
# #
# Copyright (c) 2006, Matthias Kretz, <kretz@kde.org> # Copyright (c) 2006, Matthias Kretz, <kretz@kde.org>
# Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org> # Copyright (c) 2008, Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz> # Copyright (c) 2011, Michael Jansen, <kde@michael-jansen.biz>
# Copyright (c) 2016, Roman Proskuryakov, <humbug@deeptown.org>
# #
# Redistribution and use is allowed according to the terms of the BSD license. # Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file. # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
include(LibFindMacros)
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
# The default components were taken from a survey over other FindFFMPEG.cmake files # Macro: _internal_find_component
if (NOT FFmpeg_FIND_COMPONENTS) # Checks for the given component by invoking pkgconfig etc.
set(FFmpeg_FIND_COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE) macro(_internal_find_component _component _pkgconfig _library _header)
endif () set(_package_component FFmpeg_${_component})
libfind_pkg_detect(${_package_component} ${_pkgconfig}
# FIND_PATH ${_header}
### Macro: set_component_found HINTS $ENV{FFMPEG_SDK}/include
# PATH_SUFFIXES ffmpeg
# Marks the given component as found if both *_LIBRARIES AND *_INCLUDE_DIRS is present. FIND_LIBRARY ${_library}
# HINTS $ENV{FFMPEG_SDK}/lib
macro(set_component_found _component ) )
if (${_component}_LIBRARIES AND ${_component}_INCLUDE_DIRS) set(${_package_component}_DEFINITIONS ${${_package_component}_PKGCONF_CFLAGS_OTHER})
# message(STATUS " - ${_component} found.") set(${_package_component}_VERSION ${${_package_component}_PKGCONF_VERSION})
set(${_component}_FOUND TRUE) libfind_process(${_package_component})
else ()
# message(STATUS " - ${_component} not found.")
endif ()
endmacro() endmacro()
#
### Macro: find_component
#
# Checks for the given component by invoking pkgconfig and then looking up the libraries and
# include directories.
#
macro(find_component _component _pkgconfig _library _header)
if (NOT WIN32)
# use pkg-config to get the directories and then use these values
# in the FIND_PATH() and FIND_LIBRARY() calls
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(PC_${_component} ${_pkgconfig})
endif ()
endif (NOT WIN32)
find_path(${_component}_INCLUDE_DIRS ${_header}
HINTS
${FFMPEGSDK_INC}
${PC_LIB${_component}_INCLUDEDIR}
${PC_LIB${_component}_INCLUDE_DIRS}
PATH_SUFFIXES
ffmpeg
)
find_library(${_component}_LIBRARIES NAMES ${_library}
HINTS
${FFMPEGSDK_LIB}
${PC_LIB${_component}_LIBDIR}
${PC_LIB${_component}_LIBRARY_DIRS}
)
set(${_component}_DEFINITIONS ${PC_${_component}_CFLAGS_OTHER} CACHE STRING "The ${_component} CFLAGS.")
set(${_component}_VERSION ${PC_${_component}_VERSION} CACHE STRING "The ${_component} version number.")
set_component_found(${_component})
mark_as_advanced(
${_component}_INCLUDE_DIRS
${_component}_LIBRARIES
${_component}_DEFINITIONS
${_component}_VERSION)
# setter for 'hashmap'
macro(hashmap_set _table _key) # ARGN
set(${_table}_${_key} ${ARGN})
endmacro() endmacro()
# check for key in 'hashmap'
macro(hashmap_exists _table _key _out_var)
if (DEFINED ${_table}_${_key})
set(${_out_var} TRUE)
else()
set(${_out_var} FALSE)
endif()
endmacro()
# Check for cached results. If there are skip the costly part. # getter for 'hashmap'
if (NOT FFMPEG_LIBRARIES) macro(hashmap_get _table _key _out_var)
set(${_out_var} ${${_table}_${_key}})
set (FFMPEGSDK $ENV{FFMPEG_HOME}) endmacro()
if (FFMPEGSDK)
set (FFMPEGSDK_INC "${FFMPEGSDK}/include")
set (FFMPEGSDK_LIB "${FFMPEGSDK}/lib")
endif ()
# Check for all possible component.
find_component(AVCODEC libavcodec avcodec libavcodec/avcodec.h)
find_component(AVFORMAT libavformat avformat libavformat/avformat.h)
find_component(AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
find_component(AVUTIL libavutil avutil libavutil/avutil.h)
find_component(SWSCALE libswscale swscale libswscale/swscale.h)
find_component(POSTPROC libpostproc postproc libpostproc/postprocess.h)
find_component(SWRESAMPLE libswresample swresample libswresample/swresample.h)
find_component(AVRESAMPLE libavresample avresample libavresample/avresample.h)
# Check if the required components were found and add their stuff to the FFMPEG_* vars.
foreach (_component ${FFmpeg_FIND_COMPONENTS})
if (${_component}_FOUND)
# message(STATUS "Required component ${_component} present.")
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} ${${_component}_LIBRARIES})
set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} ${${_component}_DEFINITIONS})
list(APPEND FFMPEG_INCLUDE_DIRS ${${_component}_INCLUDE_DIRS})
else ()
# message(STATUS "Required component ${_component} missing.")
endif ()
endforeach ()
# Build the include path with duplicates removed.
if (FFMPEG_INCLUDE_DIRS)
list(REMOVE_DUPLICATES FFMPEG_INCLUDE_DIRS)
endif ()
# cache the vars.
set(FFMPEG_INCLUDE_DIRS ${FFMPEG_INCLUDE_DIRS} CACHE STRING "The FFmpeg include directories." FORCE)
set(FFMPEG_LIBRARIES ${FFMPEG_LIBRARIES} CACHE STRING "The FFmpeg libraries." FORCE)
set(FFMPEG_DEFINITIONS ${FFMPEG_DEFINITIONS} CACHE STRING "The FFmpeg cflags." FORCE)
mark_as_advanced(FFMPEG_INCLUDE_DIRS
FFMPEG_LIBRARIES
FFMPEG_DEFINITIONS)
endif ()
# Now set the noncached _FOUND vars for the components. # fill 'hashmap' named find_args
foreach (_component AVCODEC AVDEVICE AVFORMAT AVUTIL POSTPROCESS SWSCALE SWRESAMPLE AVRESAMPLE) hashmap_set(find_args AVCODEC libavcodec avcodec libavcodec/avcodec.h)
set_component_found(${_component}) hashmap_set(find_args AVFORMAT libavformat avformat libavformat/avformat.h)
endforeach () hashmap_set(find_args AVDEVICE libavdevice avdevice libavdevice/avdevice.h)
hashmap_set(find_args AVUTIL libavutil avutil libavutil/avutil.h)
hashmap_set(find_args SWSCALE libswscale swscale libswscale/swscale.h)
hashmap_set(find_args POSTPROC libpostproc postproc libpostproc/postprocess.h)
hashmap_set(find_args SWRESAMPLE libswresample swresample libswresample/swresample.h)
hashmap_set(find_args AVRESAMPLE libavresample avresample libavresample/avresample.h)
# Compile the list of required vars # Check if the required components were found and add their stuff to the FFmpeg_* vars.
set(_FFmpeg_REQUIRED_VARS FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
foreach (_component ${FFmpeg_FIND_COMPONENTS}) foreach (_component ${FFmpeg_FIND_COMPONENTS})
list(APPEND _FFmpeg_REQUIRED_VARS ${_component}_LIBRARIES ${_component}_INCLUDE_DIRS) hashmap_exists(find_args ${_component} _known_component)
if (NOT _known_component)
message(FATAL_ERROR "Unknown component '${_component}'")
endif()
hashmap_get(find_args ${_component} _component_find_args)
_internal_find_component(${_component} ${_component_find_args})
set(_package_component FFmpeg_${_component})
if (${_package_component}_FOUND)
list(APPEND FFmpeg_LIBRARIES ${${_package_component}_LIBRARIES})
list(APPEND FFmpeg_INCLUDE_DIRS ${${_package_component}_INCLUDE_DIRS})
list(APPEND FFmpeg_DEFINITIONS ${${_package_component}_DEFINITIONS})
endif ()
endforeach () endforeach ()
# Give a nice error message if some of the required vars are missing. # Build the include path with duplicates removed.
find_package_handle_standard_args(FFmpeg DEFAULT_MSG ${_FFmpeg_REQUIRED_VARS}) if (FFmpeg_INCLUDE_DIRS)
list(REMOVE_DUPLICATES FFmpeg_INCLUDE_DIRS)
endif()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg
FOUND_VAR FFmpeg_FOUND
HANDLE_COMPONENTS
REQUIRED_VARS
FFmpeg_LIBRARIES
FFmpeg_INCLUDE_DIRS
)

4
extern/osg-ffmpeg-videoplayer/CMakeLists.txt vendored
Unescape Escape View File

@ -10,8 +10,8 @@ set(OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES
audiofactory.hpp audiofactory.hpp
) )
include_directories(${FFMPEG_INCLUDE_DIRS}) include_directories(${FFmpeg_INCLUDE_DIRS})
add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES}) add_library(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} STATIC ${OSG_FFMPEG_VIDEOPLAYER_SOURCE_FILES})
target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFMPEG_LIBRARIES} ${Boost_THREAD_LIBRARY}) target_link_libraries(${OSG_FFMPEG_VIDEOPLAYER_LIBRARY} ${FFmpeg_LIBRARIES} ${Boost_THREAD_LIBRARY})
link_directories(${CMAKE_CURRENT_BINARY_DIR}) link_directories(${CMAKE_CURRENT_BINARY_DIR})

Write Preview
Loading…
Cancel
Save