diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-26 07:26:52 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-26 07:26:52 +0400 |
| commit | 94f8e3198d713d4b27aff4594ee3ba7b8328691c (patch) | |
| tree | b8e8472b654eee407ef189099cb58229b656ca16 /source/blender/blenkernel/CMakeLists.txt | |
| parent | 2e0d838bc9e7d787e59bdb2d7a7156e95dd6d647 (diff) | |
| parent | 944b07f5b7339f45bfb0bded22f64458cca3980b (diff) | |
svn merge -r41266:41287 ^/trunk/blender
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 83f9f014b0a..2f2811abd7e 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -23,11 +23,6 @@ # # ***** END GPL LICENSE BLOCK ***** -if(WITH_CODEC_FFMPEG) - # FFMPEG gives warnigns which are hard to avoid across multiple versions. - remove_strict_flags() -endif() - set(INC . ../avi @@ -308,6 +303,10 @@ if(WITH_CODEC_FFMPEG) ${FFMPEG_INCLUDE_DIRS} ) add_definitions(-DWITH_FFMPEG) + + remove_strict_flags_file( + intern/writeffmpeg.c + ) endif() if(WITH_PYTHON) |