From a462d69bbf771e49d2fa49589608c375376b42ed Mon Sep 17 00:00:00 2001
From: Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Date: Thu, 20 Dec 2012 07:57:26 +0000
Subject: Another big patch set by Bastien Montagne, thanks a lot!

* Made Freestyle optional (turned on by default).

* Fix for missing bpath.c updates in the previous merge of trunk changes.
---
 source/blender/render/CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source/blender/render/CMakeLists.txt')

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 291ee8e44bd..16cba944e01 100644
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -37,7 +37,6 @@ set(INC
 	../../../intern/guardedalloc
 	../../../intern/mikktspace
 	../../../intern/smoke/extern
-	../freestyle
 )
 
 set(INC_SYS
@@ -144,6 +143,13 @@ if(WITH_MOD_SMOKE)
 	add_definitions(-DWITH_SMOKE)
 endif()
 
+if(WITH_FREESTYLE)
+	list(APPEND INC
+		../freestyle
+	)
+	add_definitions(-DWITH_FREESTYLE)
+endif()
+
 if(WITH_CODEC_QUICKTIME)
 	list(APPEND INC
 		../quicktime
-- 
cgit v1.2.3