Added some missing directory includes for CMake. Still some linker errors to resolve.

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 4c6d5717591c62fdc8ca393d3c5693f78c6c6a50..30d62521d8f4213bcc9034401d0fcfc011ed30df 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -32,7 +32,7 @@ SET(INC
   ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern
   ../../../intern/iksolver/extern ../blenloader ../quicktime
   ../../../intern/bmfont ../../../extern/bullet2/src
-  ../nodes ../../../extern/glew/include ../gpu
+  ../nodes ../../../extern/glew/include ../gpu ../makesrna
   ${SDL_INC}
   ${ZLIB_INC}
   ${PYTHON_INC}

diff --git a/source/blender/editors/CMakeLists.txt b/source/blender/editors/CMakeLists.txt
index 44557558bc63397bb5e21090fd7bb2f6cf4354e5..22e1286d2989c48c0311d241989986fd4756f3ea 100644 (file)
--- a/source/blender/editors/CMakeLists.txt
+++ b/source/blender/editors/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(INC ../windowmanager
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
   ../nodes
+  ../gpu
   ${PYTHON_INC}
   ${SDL_INC}
 )

diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt
index 067ca80b97485d2bb8cbe9fd40d88e0ae54f48bd..b0d8c34170881eb581ed420d4e64db565901fb05 100644 (file)
--- a/source/blender/makesrna/intern/CMakeLists.txt
+++ b/source/blender/makesrna/intern/CMakeLists.txt
@@ -26,7 +26,7 @@
 
 FILE(GLOB SRC *.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c)
 
-INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..)
+INCLUDE_DIRECTORIES(../../../../intern/guardedalloc .. ../../makesdna ../../blenkernel ../../blenlib)
 
 FILE(GLOB INC_FILES ../*.h ../../makesdna/*.h)
 ADD_EXECUTABLE(makesrna ${SRC} ${INC_FILES})

diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt
index 73e72ab87616b621b1705157aed6ebfc561308ad..8bbe328c7a30145cbdae5301848a24bc0bde927e 100644 (file)
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@ -37,6 +37,7 @@ SET(INC .
   ../quicktime ../../../intern/elbeem/extern
   ../../../intern/ghost ../../../intern/opennl/extern ../../../extern/glew/include
   ../nodes
+  ../gpu
   ${PYTHON_INC}
   ${SDL_INC}
 )