Fixed CMake for RNA, also removed the aggregate return warning for CMake

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50cd07820f998d04d4613f7ae2fd8a7db60b38c8..be2c9b6b950c73894f2f5c17afbb409a38df5b56 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ IF(UNIX)
   SET(PLATFORM_LINKFLAGS "-pthread")
 
   # Better warnings
-  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Waggregate-return -Wnested-externs -Wdeclaration-after-statement")
+  SET(C_WARNINGS "-Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Wnested-externs -Wdeclaration-after-statement")
 
   INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
 ENDIF(UNIX)

diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index d885d2a62410f6baa35d6701aa50f014d7dfdb4e..b2d3614bdc7d179874475797cdec1537c7884825 100644 (file)
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -39,7 +39,6 @@ SET(DEFSRC
      rna_group.c
      rna_ID.c
      rna_image.c
-     rna_ipo.c
      rna_key.c
      rna_lamp.c
      rna_lattice.c