Added new CMake build option, WITH_YAFRAY. Set to disabled by default.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3518a7b0436c11ed2d41f547d747fc3d2c6e334b..0df36f04173a86ace7bfa75710100e765215789f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,6 +66,7 @@ OPTION(WITH_PYTHON            "Enable Embedded Python API"                            ON)
 OPTION(WITH_OPENAL             "Enable OpenAL Support (http://www.openal.org)"         ON)
 OPTION(WITH_OPENMP             "Enable OpenMP (has to be supported by the compiler)"   OFF)
 OPTION(WITH_WEBPLUGIN          "Enable Web Plugin (Unix only)"                         OFF)
+OPTION(WITH_YAFRAY             "Enable Yafray (Renderer)"                              OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")

diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt
index 47688b675378825867c421bd5fe1d876aad455b8..4caeebbd6a8ed40e768a3965c067caa7b76464c0 100644 (file)
--- a/source/blender/CMakeLists.txt
+++ b/source/blender/CMakeLists.txt
@@ -24,7 +24,7 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity readblenfile render yafray)
+SUBDIRS(windowmanager editors avi nodes blenkernel blenlib blenloader blenpluginapi imbuf imbuf/intern/cineon gpu makesdna makesrna radiosity readblenfile render)
 
 IF(WITH_INTERNATIONAL)
   SUBDIRS(ftfont)
@@ -44,4 +44,8 @@ ENDIF(WITH_QUICKTIME)
 
 IF(WITH_PYTHON)
   SUBDIRS(python)
-ENDIF(WITH_PYTHON)
\ No newline at end of file
+ENDIF(WITH_PYTHON)
+
+IF(WITH_YAFRAY)
+  SUBDIRS(yafray)
+ENDIF(WITH_YAFRAY)

diff --git a/source/blender/render/CMakeLists.txt b/source/blender/render/CMakeLists.txt
index 0b659554d1a8ffa1bcbf5912c008f811a6c78e7e..c259e11a8c1373fa4a49b91d47cde09e1fe41d2e 100644 (file)
--- a/source/blender/render/CMakeLists.txt
+++ b/source/blender/render/CMakeLists.txt
@@ -32,6 +32,11 @@ SET(INC
   ../quicktime ../include ../../kernel/gen_messaging ../yafray ../blenloader
 )
 
+IF(NOT WITH_YAFRAY)
+  ADD_DEFINITIONS(-DDISABLE_YAFRAY)
+ENDIF(WITH_YAFRAY)
+
+
 IF(WITH_OPENEXR)
   ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_OPENEXR)