Revision: 18548
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18548
Author: nicholasbishop
Date: 2009-01-17 04:51:13 +0100 (Sat, 17 Jan 2009)
Log Message:
-----------
Added new CMake build option, WITH_YAFRAY. Set to disabled by default.
Modified Paths:
--------------
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/render/CMakeLists.txt
Modified: branches/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-01-17 03:31:56 UTC (rev
18547)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-01-17 03:51:13 UTC (rev
18548)
@@ -66,6 +66,7 @@
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")
Modified: branches/blender2.5/blender/source/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/CMakeLists.txt 2009-01-17
03:31:56 UTC (rev 18547)
+++ branches/blender2.5/blender/source/blender/CMakeLists.txt 2009-01-17
03:51:13 UTC (rev 18548)
@@ -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 @@
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)
Modified: branches/blender2.5/blender/source/blender/render/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/source/blender/render/CMakeLists.txt
2009-01-17 03:31:56 UTC (rev 18547)
+++ branches/blender2.5/blender/source/blender/render/CMakeLists.txt
2009-01-17 03:51:13 UTC (rev 18548)
@@ -32,6 +32,11 @@
../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)
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
