mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-12-31 10:50:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindMPEG,2: Update to current libmpeg2 behavior

Browse Source
This commit is contained in:
Christian Pfeiffer
2017-11-20 16:25:22 +01:00
parent 5f382cd822
commit fd56d6a8e6
2 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Modules/FindMPEG.cmake
View File

@@ -22,23 +22,21 @@
# MPEG_mpeg2_LIBRARY, where to find the MPEG library.
# MPEG_vo_LIBRARY, where to find the vo library.
find_path(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
/usr/local/livid
)
find_path(MPEG_INCLUDE_DIR
NAMES mpeg2.h mpeg2dec/mpeg2.h mpeg2dec/include/video_out.h)
find_library(MPEG_mpeg2_LIBRARY mpeg2
/usr/local/livid/mpeg2dec/libmpeg2/.libs
)
find_library(MPEG_mpeg2_LIBRARY mpeg2)
find_library( MPEG_vo_LIBRARY vo
/usr/local/livid/mpeg2dec/libvo/.libs
)
find_library(MPEG_vo_LIBRARY vo)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG DEFAULT_MSG MPEG_mpeg2_LIBRARY MPEG_INCLUDE_DIR)
if(MPEG_FOUND)
set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
set( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
if(MPEG_vo_LIBRARY)
list(APPEND MPEG2_LIBRARIES ${MPEG_vo_LIBRARY})
endif()
endif()
mark_as_advanced(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)

20
Modules/FindMPEG2.cmake
View File

@@ -23,28 +23,24 @@
# MPEG2_vo_LIBRARY, where to find the vo library.
find_path(MPEG2_INCLUDE_DIR
NAMES mpeg2.h mpeg2dec/mpeg2.h
PATHS /usr/local/livid
)
NAMES mpeg2.h mpeg2dec/mpeg2.h)
find_library(MPEG2_mpeg2_LIBRARY mpeg2
/usr/local/livid/mpeg2dec/libmpeg2/.libs
)
find_library(MPEG2_mpeg2_LIBRARY mpeg2)
find_library( MPEG2_vo_LIBRARY vo
/usr/local/livid/mpeg2dec/libvo/.libs
)
find_library(MPEG2_vo_LIBRARY vo)
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MPEG2 DEFAULT_MSG MPEG2_mpeg2_LIBRARY MPEG2_INCLUDE_DIR)
if(MPEG2_FOUND)
set( MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY}
${MPEG2_vo_LIBRARY})
set(MPEG2_LIBRARIES ${MPEG2_mpeg2_LIBRARY})
if(MPEG2_vo_LIBRARY)
list(APPEND MPEG2_LIBRARIES ${MPEG2_vo_LIBRARY})
endif()
#some native mpeg2 installations will depend
#on libSDL, if found, add it in.
include(${CMAKE_CURRENT_LIST_DIR}/FindSDL.cmake)
find_package(SDL)
if(SDL_FOUND)
set( MPEG2_LIBRARIES ${MPEG2_LIBRARIES} ${SDL_LIBRARY})
endif()