diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-17 06:51:13 +0300 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-01-17 06:51:13 +0300 |
| commit | ee180ff5ac140f5f19d9a00eb2b914760b06dc77 (patch) | |
| tree | 1e4042211072a921d4b010b0491985a316e196c5 | |
| parent | 9b558b21161a7d6c021f5cc0e206a5c6aa7a4ada (diff) | |
Added new CMake build option, WITH_YAFRAY. Set to disabled by default.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/blender/render/CMakeLists.txt | 5 |
3 files changed, 12 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3518a7b0436..0df36f04173 100644 --- 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 47688b67537..4caeebbd6a8 100644 --- 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 0b659554d1a..c259e11a8c1 100644 --- 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) |