diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-28 17:44:17 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-28 17:44:17 +0300 |
| commit | bc2055e7b75162453d7e68fdc5ffdf3d4c328ff1 (patch) | |
| tree | d18151716b6d44d898eaafc5592ef9a3516f75d6 /CMakeLists.txt | |
| parent | 55ad6a99f6f2cd9446261bee78844f8b6d605d6e (diff) | |
| parent | f8c383472a68ae1fdfc5b98c63fb1cd27c49e690 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
source/blender/editors/interface/interface_utils.c
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e21a63b87c..4d65520bc07 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1179,6 +1179,12 @@ if(UNIX AND NOT APPLE) # GNU Compiler if(CMAKE_COMPILER_IS_GNUCC) set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") + + if(NOT "${CMAKE_C_COMPILER_VERSION}" VERSION_LESS "5.0") + # GCC5 uses gnu11, until we update, force c89 + # though some c11 features can still be used. + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu89") + endif() # CLang is the same as GCC for now. elseif(CMAKE_C_COMPILER_ID MATCHES "Clang") set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing") |