195d9f90cf
OK sthen@, landry@ (who also tested this in a bulk build)
36 lines
1.3 KiB
Plaintext
36 lines
1.3 KiB
Plaintext
$OpenBSD: patch-Modules_FindMPEG_cmake,v 1.3 2010/11/15 11:39:09 dcoppa Exp $
|
|
--- Modules/FindMPEG.cmake.orig Tue Apr 6 16:45:31 2010
|
|
+++ Modules/FindMPEG.cmake Mon May 3 11:01:02 2010
|
|
@@ -20,25 +20,21 @@
|
|
# (To distribute this file outside of CMake, substitute the full
|
|
# License text for the above reference.)
|
|
|
|
-FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/include/video_out.h
|
|
- /usr/local/livid
|
|
+FIND_PATH(MPEG_INCLUDE_DIR mpeg2dec/mpeg2.h
|
|
+ ${LOCALBASE}/include
|
|
)
|
|
|
|
FIND_LIBRARY(MPEG_mpeg2_LIBRARY mpeg2
|
|
- /usr/local/livid/mpeg2dec/libmpeg2/.libs
|
|
+ ${LOCALBASE}/lib
|
|
)
|
|
|
|
-FIND_LIBRARY( MPEG_vo_LIBRARY vo
|
|
- /usr/local/livid/mpeg2dec/libvo/.libs
|
|
-)
|
|
-
|
|
# handle the QUIETLY and REQUIRED arguments and set MPEG2_FOUND to TRUE if
|
|
# all listed variables are TRUE
|
|
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_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
|
|
|
|
IF(MPEG_FOUND)
|
|
- SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} ${MPEG_vo_LIBRARY} )
|
|
+ SET( MPEG_LIBRARIES ${MPEG_mpeg2_LIBRARY} )
|
|
ENDIF(MPEG_FOUND)
|
|
|
|
-MARK_AS_ADVANCED(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY MPEG_vo_LIBRARY)
|
|
+MARK_AS_ADVANCED(MPEG_INCLUDE_DIR MPEG_mpeg2_LIBRARY)
|