From c4edbe6537dd38d1ff75e631701493f463b7abe2 Mon Sep 17 00:00:00 2001 From: Joao Carreira Date: Sun, 16 Nov 2014 21:55:32 +0000 Subject: [PATCH] Fix find ffmpeg cmake command --- CMakeLists.txt | 2 +- ModuleDefinition.cmake | 14 -------------- 2 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 ModuleDefinition.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index b85fd84..698cdc2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,7 +55,7 @@ SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DE OPTION( USE_FFMPEG "Add FFMPEG support" OFF ) IF( USE_FFMPEG ) - FIND_PACKAGE( OpenCV ) + FIND_PACKAGE( FFmpeg ) SET(USE_FFMPEG ${FFMPEG_FOUND}) ENDIF() SET_PACKAGE_PROPERTIES(FFmpeg PROPERTIES URL "http://ffmpeg.org/" DESCRIPTION "Libav library support in PlaYUVerStream" TYPE OPTIONAL) diff --git a/ModuleDefinition.cmake b/ModuleDefinition.cmake deleted file mode 100644 index e6b14a5..0000000 --- a/ModuleDefinition.cmake +++ /dev/null @@ -1,14 +0,0 @@ -###################################################################################### -# Default Modules -###################################################################################### - -ADD_MODULE( FilterComponentLuma "FilterComponent" ) -ADD_MODULE( FilterComponentChromaU "FilterComponent" ) -ADD_MODULE( FilterComponentChromaV "FilterComponent" ) -ADD_MODULE( FrameDifference "FrameDifference" ) -ADD_MODULE( MeasurePSNR "MeasurePSNR" ) - -IF( USE_OPENCV ) - ADD_MODULE( DisparityStereoVar "DisparityStereoVar" ) -ENDIF() -