diff options
| author | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-20 16:25:22 +0100 |
|---|---|---|
| committer | Christian Pfeiffer <cpfeiffer@live.de> | 2017-11-20 16:29:00 +0100 |
| commit | fd56d6a8e637750cbf2e038bde12164962c66bc4 (patch) | |
| tree | dcaf3f7280df44aaf4f1ce2b585cc20d829db8ed /Modules/FindMPEG.cmake | |
| parent | 5f382cd8222d0cec719823b56b2237bea7fc015c (diff) | |
| download | cmake-fd56d6a8e637750cbf2e038bde12164962c66bc4.tar.gz | |
FindMPEG,2: Update to current libmpeg2 behavior
Diffstat (limited to 'Modules/FindMPEG.cmake')
| -rw-r--r-- | Modules/FindMPEG.cmake | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/Modules/FindMPEG.cmake b/Modules/FindMPEG.cmake index cd1b0214e7..850a57e4d1 100644 --- a/Modules/FindMPEG.cmake +++ b/Modules/FindMPEG.cmake @@ -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) |