From 3c36bc9f51d69d6c9abc7474f3496b2b0e05f28c Mon Sep 17 00:00:00 2001 From: Michael Pavlyshko Date: Fri, 11 Jul 2014 12:43:24 +0300 Subject: [PATCH] Enable FFmpeg for all platforms --- CMakeLists.txt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c7db3410..4f6fd43cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,8 +88,10 @@ if(NOT WIN32) endif() endif() +set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE) find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale REQUIRED) find_package(ZLIB REQUIRED) +find_package(FFmpeg REQUIRED) if (ENABLE_SDL2) find_package(SDL2 REQUIRED) @@ -124,11 +126,6 @@ if(ENABLE_TEST) find_package(Boost 1.48.0 COMPONENTS program_options filesystem system thread locale unit_test_framework REQUIRED) endif() -if(NOT WIN32) - set(FFmpeg_FIND_COMPONENTS AVFORMAT SWSCALE) - find_package(FFmpeg REQUIRED) -endif() - if(CMAKE_COMPILER_IS_GNUCXX OR NOT WIN32) #so far all *nix compilers support such parameters if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CLANG_SPECIFIC_FLAGS "-Wno-mismatched-tags")