diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-10-28 21:00:53 +0400 |
| commit | 46ae692710467d3622f58e0c5ce371674a6a7d9b (patch) | |
| tree | ebd27a8cc3adad65343a6a8d3d22ce02cad24db8 /source/blender/blenkernel/CMakeLists.txt | |
| parent | fae903e263fd11d788a4e55900ff25f4fc8b26db (diff) | |
| parent | 7627a742ab6e630522186b04a71fa40533d87db2 (diff) | |
Merge with trunk r41342
Diffstat (limited to 'source/blender/blenkernel/CMakeLists.txt')
| -rw-r--r-- | source/blender/blenkernel/CMakeLists.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index bccabd80ada..68dc8940fce 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -1,4 +1,3 @@ -# $Id$ # ***** BEGIN GPL LICENSE BLOCK ***** # # This program is free software; you can redistribute it and/or @@ -24,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 @@ -306,6 +300,10 @@ if(WITH_CODEC_FFMPEG) ${FFMPEG_INCLUDE_DIRS} ) add_definitions(-DWITH_FFMPEG) + + remove_strict_flags_file( + intern/writeffmpeg.c + ) endif() if(WITH_PYTHON) |