Merged changes in the trunk up to revision 32271.

[blender.git] / source / blender / blenkernel / CMakeLists.txt

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 1b6411e4f64acbcd436cd524357c3cb18c24ccb6..c8645f91de813e6d592705b8bbe6576d5cda0dc0 100644 (file)
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -31,6 +31,7 @@ SET(INC
        ../avi
        ../blenlib
        ../blenloader
+       ../freestyle
        ../gpu
        ../ikplugin
        ../imbuf
@@ -108,7 +109,7 @@ ELSE(WITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
 IF(WITH_OPENMP)
-       ADD_DEFINITIONS(-DPARALLEL=1)
+               ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
 IF(NOT WITH_FLUID)