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