diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 01:01:38 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-07-12 01:07:44 +0300 |
commit | cfbd605567f48229a923df382baf6db98fbafc61 (patch) | |
tree | d4218c49672047d6c3b37517034660b3b5dcd966 /extern/CMakeLists.txt | |
parent | 71a57a37b2eebbed53b5335019287b4df9c30519 (diff) | |
parent | 7212ebd09f9720883581221be923ae5e97ff5d76 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
intern/cycles/blender/addon/ui.py
source/blender/blenkernel/BKE_particle.h
source/blender/blenkernel/intern/dynamicpaint.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_distribute.c
source/blender/blenkernel/intern/texture.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/physics/particle_edit.c
source/blender/editors/physics/particle_object.c
source/blender/editors/transform/transform_snap_object.c
Diffstat (limited to 'extern/CMakeLists.txt')
-rw-r--r-- | extern/CMakeLists.txt | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 58e0c68148b..b046e9626b6 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -29,6 +29,14 @@ add_subdirectory(curve_fit_nd) # Otherwise we get warnings here that we cant fix in external projects remove_strict_flags() +# Not a strict flag, but noisy for code we don't maintain +if(CMAKE_COMPILER_IS_GNUCC) + remove_cc_flag( + "-Wmisleading-indentation" + ) +endif() + + add_subdirectory(rangetree) add_subdirectory(wcwidth) |