From 560dd932c2a84d7d1a4b93554faa7bc66dfdb649 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 21 Oct 2014 03:21:09 +0600 Subject: [PATCH] Don't change global compiler flags when FFmpeg is enabled It should no be longer needed. If it causes the issues please let me know to find a more cleaner solution. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 91a8a0420d2..497abb354a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -789,7 +789,6 @@ if(UNIX AND NOT APPLE) mark_as_advanced(FFMPEG_LIBRARIES) set(FFMPEG_LIBPATH ${FFMPEG}/lib) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS") endif() if(WITH_FFTW3) @@ -1801,7 +1800,6 @@ elseif(APPLE) set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) set(FFMPEG_LIBRARIES avcodec avdevice avformat avutil mp3lame swscale x264 xvidcore theora theoradec theoraenc vorbis vorbisenc vorbisfile ogg) set(FFMPEG_LIBPATH ${FFMPEG}/lib) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS") endif() find_library(SYSTEMSTUBS_LIBRARY