Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-10-21 01:21:09 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-10-21 01:22:05 +0400
commit560dd932c2a84d7d1a4b93554faa7bc66dfdb649 (patch)
treefb6e65d55283db26f2613c0a192e2c857cd411d9 /CMakeLists.txt
parentabb266973d45c1a97e5734176662ead99e97a9da (diff)
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.
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt2
1 files changed, 0 insertions, 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